From 309603f19b015db91fccb478ae301a47034139d0 Mon Sep 17 00:00:00 2001
From: Yann GASCUEL <34003959+lnv42@users.noreply.github.com>
Date: Fri, 6 Jan 2023 15:57:39 +0100
Subject: [PATCH 01/19] Add new Standalone mode LF_PROX2BRUT: HID ProxII
 brueforce v2

Trivial card number brute forcer for when you know the facility code
and want to find valid(s) card number(s).
---
 armsrc/Standalone/Makefile.hal    |   5 +-
 armsrc/Standalone/Makefile.inc    |   4 ++
 armsrc/Standalone/lf_prox2brute.c | 108 ++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 armsrc/Standalone/lf_prox2brute.c

diff --git a/armsrc/Standalone/Makefile.hal b/armsrc/Standalone/Makefile.hal
index 6b4510da8..3c18e681b 100644
--- a/armsrc/Standalone/Makefile.hal
+++ b/armsrc/Standalone/Makefile.hal
@@ -56,6 +56,9 @@ define KNOWN_STANDALONE_DEFINITIONS
 | LF_PROXBRUTE    | HID ProxII bruteforce                  |
 |                 | - Brad Antoniewicz                     |
 +----------------------------------------------------------+
+| LF_PROX2BRUTE   | HID ProxII bruteforce v2               |
+|                 |                                        |
++----------------------------------------------------------+
 | LF_SAMYRUN      | HID26 read/clone/sim                   |
 | (default)       | - Samy Kamkar                          |
 +----------------------------------------------------------+
@@ -118,7 +121,7 @@ define KNOWN_STANDALONE_DEFINITIONS
 +----------------------------------------------------------+
 endef
 
-STANDALONE_MODES := LF_SKELETON LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RSWW LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_PROXBRUTE LF_SAMYRUN LF_THAREXDE LF_NEXID
+STANDALONE_MODES := LF_SKELETON LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RSWW LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_PROXBRUTE LF_PROX2BRUTE LF_SAMYRUN LF_THAREXDE LF_NEXID
 STANDALONE_MODES += HF_14ASNIFF HF_14BSNIFF HF_15SNIFF HF_AVEFUL HF_BOG HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_LEGICSIM HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_TCPRST HF_TMUDFORD HF_YOUNG HF_REBLAY DANKARMULTI
 STANDALONE_MODES_REQ_BT := HF_REBLAY
 STANDALONE_MODES_REQ_SMARTCARD :=
diff --git a/armsrc/Standalone/Makefile.inc b/armsrc/Standalone/Makefile.inc
index 05a63f1dd..15218912c 100644
--- a/armsrc/Standalone/Makefile.inc
+++ b/armsrc/Standalone/Makefile.inc
@@ -29,6 +29,10 @@ endif
 ifneq (,$(findstring WITH_STANDALONE_LF_PROXBRUTE,$(APP_CFLAGS)))
     SRC_STANDALONE = lf_proxbrute.c
 endif
+# WITH_STANDALONE_LF_PROX2BRUTE
+ifneq (,$(findstring WITH_STANDALONE_LF_PROX2BRUTE,$(APP_CFLAGS)))
+    SRC_STANDALONE = lf_prox2brute.c
+endif
 # WITH_STANDALONE_LF_HIDBRUTE
 ifneq (,$(findstring WITH_STANDALONE_LF_HIDBRUTE,$(APP_CFLAGS)))
     SRC_STANDALONE = lf_hidbrute.c
diff --git a/armsrc/Standalone/lf_prox2brute.c b/armsrc/Standalone/lf_prox2brute.c
new file mode 100644
index 000000000..0117e91e6
--- /dev/null
+++ b/armsrc/Standalone/lf_prox2brute.c
@@ -0,0 +1,108 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) Brad Antoniewicz 2011
+// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.
+//
+// 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.
+//
+// See LICENSE.txt for the text of the license.
+//-----------------------------------------------------------------------------
+// LF HID ProxII Brutforce v2 by lnv42 - based on Proxbrute by Brad antoniewicz
+//
+//     Following code is a trivial brute forcer for when you know the facility
+//     code and want to find valid(s) card number(s). It will try all card
+//     fnumbers rom CARDNUM_START to CARDNUM_END one by one (max. ~65k tries).
+//     This brute force will be a lot faster than Proxbrute that will try all
+//     possibles values for LF low, even those with bad checksum (~4g tries).
+//     LEDs will help you know which card number(s) worked.
+//
+//-----------------------------------------------------------------------------
+#include "standalone.h" // standalone definitions
+#include "proxmark3_arm.h"
+#include "appmain.h"
+#include "fpgaloader.h"
+#include "util.h"
+#include "dbprint.h"
+#include "lfops.h"
+#include "parity.h"
+
+#define CARDNUM_START 0
+#define CARDNUM_END 0xFFFF
+#define FACILITY_CODE 2
+
+void ModInfo(void) {
+    DbpString("  LF HID ProxII bruteforce v2");
+}
+
+// samy's sniff and repeat routine for LF
+void RunMod(void) {
+    StandAloneMode();
+    Dbprintf(">>  LF HID proxII bruteforce v2 a.k.a Prox2Brute Started <<");
+    FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
+    const uint32_t high = 0x20; // LF high value is always 0x20 here
+    uint32_t low = 0;
+
+    uint32_t fac = FACILITY_CODE, cardnum = 0;
+
+    LED_D_ON();
+    while (BUTTON_HELD(200) != BUTTON_HOLD) { // Waiting for a 200ms button press
+        WDT_HIT();
+        // exit from SamyRun,   send a usbcommand.
+        if (data_available()) { // early exit
+             DbpString("[=] You can take the shell back :) ...");
+            LEDsoff();
+            return;
+        }
+    }
+    
+    LED_C_ON();
+    WAIT_BUTTON_RELEASED(); // We are now ready to start brutforcing card numbers
+    LEDsoff();
+
+    Dbprintf("[=] Starting HID ProxII Bruteforce from card %08x to %08x",
+             CARDNUM_START, MIN(CARDNUM_END, 0xFFFF));
+        
+    for (cardnum = CARDNUM_START ; cardnum <= MIN(CARDNUM_END, 0xFFFF) ; cardnum++) {
+        WDT_HIT();
+
+        // exit from SamyRun,   send a usbcommand.
+        if (data_available()) break;
+
+        // short button press may be used for fast-forward
+        if (BUTTON_HELD(1000) == BUTTON_HOLD) break; // long button press (>=1sec) exit
+
+        // calculate the new LF low value including Card number, Facility code and checksum
+        low = (cardnum << 1) | (fac << 17);
+        low |= oddparity32((low >> 1) & 0xFFF);
+        low |= evenparity32((low >> 13) & 0xFFF) << 25;
+
+        Dbprintf("[=] trying Facility = %08x, Card = %08x, raw = %08x%08x",
+                 fac, cardnum, high, low);
+
+        // Start simulating an HID TAG, with high/low values, no led control and 20000 cycles timeout
+        CmdHIDsimTAGEx(0, high, low, 0, false, 20000);
+
+        // switch leds to be able to know (aproximatly) which card number worked (64 tries loop)
+        LED_A_INV(); // switch led A every try
+        if ((cardnum-CARDNUM_START) % 8 == 7) // switch led B every 8 tries
+            LED_B_INV();
+        if ((cardnum-CARDNUM_START) % 16 == 15) // switch led C every 16 tries
+            LED_C_INV();
+        if ((cardnum-CARDNUM_START) % 32 == 31) // switch led D every 32 tries
+            LED_D_INV();
+    }
+    
+    SpinErr((LED_A | LED_B | LED_C | LED_D), 250, 5); // Xmax tree
+    Dbprintf("[=] Ending HID ProxII Bruteforce from card %08x to %08x",
+             CARDNUM_START, cardnum - 1);
+    DbpString("[=] You can take the shell back :) ...");
+    LEDsoff(); // This is the end
+}

From 8f2362e7b0cc8ba72f9084cdcb7f81580617c876 Mon Sep 17 00:00:00 2001
From: Krzysztof Zdulski <krzys.zdulski@gmail.com>
Date: Sun, 15 Jan 2023 16:33:32 +0100
Subject: [PATCH 02/19] Fix mifare classic dump when block cannot be read

---
 client/src/cmdhfmf.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c
index 11d101391..b98f21c01 100644
--- a/client/src/cmdhfmf.c
+++ b/client/src/cmdhfmf.c
@@ -1044,11 +1044,9 @@ static int CmdHF14AMfDump(const char *Cmd) {
                     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 {
                 PrintAndLogEx(WARNING, "command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);
-                break;
             }
         }
     }

From ee8759bc8bc718cad86037535dcbed8969344435 Mon Sep 17 00:00:00 2001
From: zebbe94 <63231705+zebbe-94@users.noreply.github.com>
Date: Mon, 16 Jan 2023 01:06:12 +0100
Subject: [PATCH 03/19] fix typo

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

diff --git a/client/src/cmdsmartcard.c b/client/src/cmdsmartcard.c
index 5cceb8b48..9c273739d 100644
--- a/client/src/cmdsmartcard.c
+++ b/client/src/cmdsmartcard.c
@@ -719,7 +719,7 @@ static int CmdSmartInfo(const char *Cmd) {
 
     // print header
     PrintAndLogEx(INFO, "--- " _CYAN_("Smartcard Information") " ---------");
-    PrintAndLogEx(INFO, "ISO7618-3 ATR... %s", sprint_hex(card.atr, card.atr_len));
+    PrintAndLogEx(INFO, "ISO7816-3 ATR... %s", sprint_hex(card.atr, card.atr_len));
     // convert bytes to str.
     char *hexstr = calloc((card.atr_len << 1) + 1, sizeof(uint8_t));
     if (hexstr == NULL) {

From 3a7af557244b46c8a991684761f72211ebcb6abf Mon Sep 17 00:00:00 2001
From: Jean-Michel Picod <jmichel@google.com>
Date: Mon, 16 Jan 2023 19:57:42 +0100
Subject: [PATCH 04/19] Fix python initialization to have SWIG work

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

diff --git a/client/src/cmdscript.c b/client/src/cmdscript.c
index 35640922e..57cf54084 100644
--- a/client/src/cmdscript.c
+++ b/client/src/cmdscript.c
@@ -147,7 +147,7 @@ static int split(char *str, char **arr) {
     return word_cnt;
 }
 
-static void set_python_path(char *path) {
+static void set_python_path(const char *path) {
     PyObject *syspath = PySys_GetObject("path");
     if (syspath == 0) {
         PrintAndLogEx(WARNING, "Python failed to getobject");
@@ -172,7 +172,7 @@ static void set_python_paths(void) {
         char scripts_path[strlen(exec_path) + strlen(PYTHON_SCRIPTS_SUBDIR) + strlen(PYTHON_LIBRARIES_WILDCARD) + 1];
         strcpy(scripts_path, exec_path);
         strcat(scripts_path, PYTHON_SCRIPTS_SUBDIR);
-//        strcat(scripts_path, PYTHON_LIBRARIES_WILDCARD);
+        // strcat(scripts_path, PYTHON_LIBRARIES_WILDCARD);
         set_python_path(scripts_path);
     }
 
@@ -183,7 +183,7 @@ static void set_python_paths(void) {
         strcpy(scripts_path, user_path);
         strcat(scripts_path, PM3_USER_DIRECTORY);
         strcat(scripts_path, PYTHON_SCRIPTS_SUBDIR);
-//        strcat(scripts_path, PYTHON_LIBRARIES_WILDCARD);
+        // strcat(scripts_path, PYTHON_LIBRARIES_WILDCARD);
         set_python_path(scripts_path);
 
     }
@@ -194,7 +194,7 @@ static void set_python_paths(void) {
         strcpy(scripts_path, exec_path);
         strcat(scripts_path, PM3_SHARE_RELPATH);
         strcat(scripts_path, PYTHON_SCRIPTS_SUBDIR);
-//        strcat(scripts_path, PYTHON_LIBRARIES_WILDCARD);
+        // strcat(scripts_path, PYTHON_LIBRARIES_WILDCARD);
         set_python_path(scripts_path);
     }
 }
@@ -407,12 +407,16 @@ static int CmdScriptRun(const char *Cmd) {
         Py_Initialize();
 #else
         PyConfig py_conf;
-        PyConfig_InitIsolatedConfig(&py_conf);
-        // Despite being isolated we probably want to allow users to use
-        // the Python packages they installed on their user directory as well
-        // as system ones. But it seems isolated mode still enforces them off.
-        py_conf.use_environment = 1;
+        // We need to use Python mode instead of isolated to avoid breaking stuff.
+        PyConfig_InitPythonConfig(&py_conf);
+        // Let's still make things bit safer by being as close as possible to isolated mode.
+        py_conf.configure_c_stdio = -1;
+        py_conf.faulthandler = 0;
+        py_conf.use_hash_seed = 0;
+        py_conf.install_signal_handlers = 0;
+        py_conf.parse_argv = 0;
         py_conf.user_site_directory = 1;
+        py_conf.use_environment = 0;
 #endif
 
         //int argc, char ** argv
@@ -429,8 +433,13 @@ static int CmdScriptRun(const char *Cmd) {
 #else
         // The following line will implicitly pre-initialize Python
         PyConfig_SetBytesArgv(&py_conf, argc + 1, argv);
+        
+        // We disallowed in py_conf environment variables interfering with python interpreter's behavior.
+        // Let's manually enable the ones we truly need.
         // This is required by Proxspace to work with an isolated Python configuration
         PyConfig_SetBytesString(&py_conf, &py_conf.home, getenv("PYTHONHOME"));
+        // This is required for allowing `import pm3` in python scripts
+        PyConfig_SetBytesString(&py_conf, &py_conf.pythonpath_env, getenv("PYTHONPATH"));
 
         Py_InitializeFromConfig(&py_conf);
 

From e1c8c977c2d86f615bf41777bc37fc2284f98162 Mon Sep 17 00:00:00 2001
From: Krzysztof Zdulski <krzys.zdulski@gmail.com>
Date: Wed, 18 Jan 2023 14:41:57 +0100
Subject: [PATCH 05/19] Check is sector is readable before attempting to read

---
 client/src/cmdhfmf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c
index b98f21c01..57de6ee70 100644
--- a/client/src/cmdhfmf.c
+++ b/client/src/cmdhfmf.c
@@ -971,6 +971,11 @@ static int CmdHF14AMfDump(const char *Cmd) {
         for (blockNo = 0; blockNo < mfNumBlocksPerSector(sectorNo); blockNo++) {
             bool received = false;
             current_key = MF_KEY_A;
+            uint8_t data_area = (sectorNo < 32) ? blockNo : blockNo / 5;
+            if (rights[sectorNo][data_area] == 0x07) {                                     // no key would work
+                PrintAndLogEx(WARNING, "access rights do not allow reading of sector %2d block %3d, skipping", sectorNo, blockNo);
+                continue;
+            }
             for (tries = 0; tries < MIFARE_SECTOR_RETRY; tries++) {
                 if (blockNo == mfNumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
 
@@ -982,7 +987,6 @@ static int CmdHF14AMfDump(const char *Cmd) {
                     SendCommandNG(CMD_HF_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t));
                     received = WaitForResponseTimeout(CMD_HF_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;
                     if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
 
                         payload.blockno = mfFirstBlockOfSector(sectorNo) + blockNo;
@@ -992,10 +996,6 @@ static int CmdHF14AMfDump(const char *Cmd) {
                         clearCommandBuffer();
                         SendCommandNG(CMD_HF_MIFARE_READBL, (uint8_t *)&payload, sizeof(mf_readblock_t));
                         received = WaitForResponseTimeout(CMD_HF_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);
-                        // where do you want to go??  Next sector or block?
-                        break;
                     } else {                                                                              // key A would work
 
                         payload.blockno = mfFirstBlockOfSector(sectorNo) + blockNo;

From d96cef2b504155337b0696265dab642377208069 Mon Sep 17 00:00:00 2001
From: colonelborkmundus <colonelborkmundus@gmail.com>
Date: Wed, 18 Jan 2023 11:36:07 -0500
Subject: [PATCH 06/19] 	modified:   client/dictionaries/mfc_default_keys.dic

---
 client/dictionaries/mfc_default_keys.dic |   17 +
 client/src/cmdhflist.c                   |    2 +-
 client/src/pm3line_vocabulory.h          | 1484 +++++++++++-----------
 3 files changed, 760 insertions(+), 743 deletions(-)

diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic
index a336a32b5..433a91ce5 100644
--- a/client/dictionaries/mfc_default_keys.dic
+++ b/client/dictionaries/mfc_default_keys.dic
@@ -1909,3 +1909,20 @@ D144BD193063
 # Keys Swim
 8627C10A7014
 453857395635
+#
+##########################################
+#
+# added by colonelborkmundus
+# "the more, the marriott" mifare project
+#
+# mifare classic 1k - graduate hotel
+0D258FE90296
+17193709ADF4
+#
+# mifare classic 1K - marriott
+
+
+
+
+
+
diff --git a/client/src/cmdhflist.c b/client/src/cmdhflist.c
index a19ecdea9..232d4af19 100644
--- a/client/src/cmdhflist.c
+++ b/client/src/cmdhflist.c
@@ -318,7 +318,7 @@ int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool i
                 snprintf(exp, size, "AUTH-B(%d)", cmd[1]);
                 break;
             }
-            case MIFARE_MAGIC_GDM_AUTH_KEYA:{
+            case MIFARE_MAGIC_GDM_AUTH_KEYA: {
                 if (cmdsize > 3) {
                     snprintf(exp, size, "MAGIC AUTH-A(%d)", cmd[1]);
                     MifareAuthState = masNt;
diff --git a/client/src/pm3line_vocabulory.h b/client/src/pm3line_vocabulory.h
index 5a517c645..91a88a1c0 100644
--- a/client/src/pm3line_vocabulory.h
+++ b/client/src/pm3line_vocabulory.h
@@ -31,747 +31,747 @@ typedef struct vocabulory_s {
 } vocabulory_t;
 
 const static vocabulory_t vocabulory[] = {
-    { 1, "help" }, 
-    { 0, "auto" }, 
-    { 1, "clear" }, 
-    { 1, "hints" }, 
-    { 1, "msleep" }, 
-    { 1, "rem" }, 
-    { 1, "quit" }, 
-    { 1, "exit" }, 
-    { 1, "prefs help" }, 
-    { 1, "prefs show" }, 
-    { 1, "prefs get barmode" }, 
-    { 1, "prefs get clientdebug" }, 
-    { 1, "prefs get clientdelay" }, 
-    { 1, "prefs get color" }, 
-    { 1, "prefs get savepaths" }, 
-    { 1, "prefs get emoji" }, 
-    { 1, "prefs get hints" }, 
-    { 1, "prefs get output" }, 
-    { 1, "prefs get plotsliders" }, 
-    { 1, "prefs set help" }, 
-    { 1, "prefs set barmode" }, 
-    { 1, "prefs set clientdebug" }, 
-    { 1, "prefs set clientdelay" }, 
-    { 1, "prefs set color" }, 
-    { 1, "prefs set emoji" }, 
-    { 1, "prefs set hints" }, 
-    { 1, "prefs set savepaths" }, 
-    { 1, "prefs set output" }, 
-    { 1, "prefs set plotsliders" }, 
-    { 1, "analyse help" }, 
-    { 1, "analyse lcr" }, 
-    { 1, "analyse crc" }, 
-    { 1, "analyse chksum" }, 
-    { 1, "analyse dates" }, 
-    { 1, "analyse lfsr" }, 
-    { 1, "analyse a" }, 
-    { 1, "analyse nuid" }, 
-    { 1, "analyse demodbuff" }, 
-    { 1, "analyse freq" }, 
-    { 1, "analyse foo" }, 
-    { 1, "analyse units" }, 
-    { 1, "data help" }, 
-    { 1, "data biphaserawdecode" }, 
-    { 1, "data detectclock" }, 
-    { 1, "data fsktonrz" }, 
-    { 1, "data manrawdecode" }, 
-    { 1, "data modulation" }, 
-    { 1, "data rawdemod" }, 
-    { 1, "data askedgedetect" }, 
-    { 1, "data autocorr" }, 
-    { 1, "data dirthreshold" }, 
-    { 1, "data decimate" }, 
-    { 1, "data undecimate" }, 
-    { 1, "data hide" }, 
-    { 1, "data hpf" }, 
-    { 1, "data iir" }, 
-    { 1, "data grid" }, 
-    { 1, "data ltrim" }, 
-    { 1, "data mtrim" }, 
-    { 1, "data norm" }, 
-    { 1, "data plot" }, 
-    { 1, "data rtrim" }, 
-    { 1, "data setgraphmarkers" }, 
-    { 1, "data shiftgraphzero" }, 
-    { 1, "data timescale" }, 
-    { 1, "data zerocrossings" }, 
-    { 1, "data convertbitstream" }, 
-    { 1, "data getbitstream" }, 
-    { 1, "data asn1" }, 
-    { 1, "data bin2hex" }, 
-    { 0, "data bitsamples" }, 
-    { 1, "data clear" }, 
-    { 1, "data diff" }, 
-    { 0, "data hexsamples" }, 
-    { 1, "data hex2bin" }, 
-    { 1, "data load" }, 
-    { 1, "data print" }, 
-    { 0, "data samples" }, 
-    { 1, "data save" }, 
-    { 1, "data setdebugmode" }, 
-    { 0, "data tune" }, 
-    { 1, "emv help" }, 
-    { 0, "emv exec" }, 
-    { 0, "emv pse" }, 
-    { 0, "emv search" }, 
-    { 0, "emv select" }, 
-    { 0, "emv gpo" }, 
-    { 0, "emv readrec" }, 
-    { 0, "emv genac" }, 
-    { 0, "emv challenge" }, 
-    { 0, "emv intauth" }, 
-    { 0, "emv scan" }, 
-    { 1, "emv test" }, 
-    { 1, "emv list" }, 
-    { 0, "emv roca" }, 
-    { 1, "hf help" }, 
-    { 1, "hf list" }, 
-    { 0, "hf plot" }, 
-    { 0, "hf tune" }, 
-    { 1, "hf search" }, 
-    { 0, "hf sniff" }, 
-    { 1, "hf 14a help" }, 
-    { 1, "hf 14a list" }, 
-    { 0, "hf 14a antifuzz" }, 
-    { 0, "hf 14a config" }, 
-    { 0, "hf 14a cuids" }, 
-    { 0, "hf 14a info" }, 
-    { 0, "hf 14a sim" }, 
-    { 0, "hf 14a sniff" }, 
-    { 0, "hf 14a raw" }, 
-    { 0, "hf 14a reader" }, 
-    { 0, "hf 14a apdu" }, 
-    { 0, "hf 14a apdufind" }, 
-    { 0, "hf 14a chaining" }, 
-    { 0, "hf 14a ndefformat" }, 
-    { 0, "hf 14a ndefread" }, 
-    { 0, "hf 14a ndefwrite" }, 
-    { 1, "hf 14b help" }, 
-    { 0, "hf 14b apdu" }, 
-    { 0, "hf 14b dump" }, 
-    { 0, "hf 14b info" }, 
-    { 1, "hf 14b list" }, 
-    { 0, "hf 14b ndefread" }, 
-    { 0, "hf 14b raw" }, 
-    { 0, "hf 14b reader" }, 
-    { 0, "hf 14b sim" }, 
-    { 0, "hf 14b sniff" }, 
-    { 0, "hf 14b rdbl" }, 
-    { 0, "hf 14b sriwrite" }, 
-    { 1, "hf 14b view" }, 
-    { 1, "hf 15 help" }, 
-    { 1, "hf 15 list" }, 
-    { 1, "hf 15 demod" }, 
-    { 0, "hf 15 dump" }, 
-    { 0, "hf 15 info" }, 
-    { 0, "hf 15 sniff" }, 
-    { 0, "hf 15 raw" }, 
-    { 0, "hf 15 rdbl" }, 
-    { 0, "hf 15 rdmulti" }, 
-    { 0, "hf 15 reader" }, 
-    { 0, "hf 15 restore" }, 
-    { 0, "hf 15 samples" }, 
-    { 0, "hf 15 eload" }, 
-    { 0, "hf 15 esave" }, 
-    { 0, "hf 15 eview" }, 
-    { 0, "hf 15 sim" }, 
-    { 0, "hf 15 slixdisable" }, 
-    { 0, "hf 15 wrbl" }, 
-    { 0, "hf 15 findafi" }, 
-    { 0, "hf 15 writeafi" }, 
-    { 0, "hf 15 writedsfid" }, 
-    { 0, "hf 15 csetuid" }, 
-    { 1, "hf cipurse help" }, 
-    { 0, "hf cipurse info" }, 
-    { 0, "hf cipurse select" }, 
-    { 0, "hf cipurse auth" }, 
-    { 0, "hf cipurse read" }, 
-    { 0, "hf cipurse write" }, 
-    { 0, "hf cipurse aread" }, 
-    { 0, "hf cipurse awrite" }, 
-    { 0, "hf cipurse formatall" }, 
-    { 0, "hf cipurse create" }, 
-    { 0, "hf cipurse delete" }, 
-    { 0, "hf cipurse updkey" }, 
-    { 0, "hf cipurse updakey" }, 
-    { 0, "hf cipurse default" }, 
-    { 1, "hf cipurse test" }, 
-    { 1, "hf epa help" }, 
-    { 0, "hf epa cnonces" }, 
-    { 0, "hf epa replay" }, 
-    { 0, "hf epa sim" }, 
-    { 1, "hf emrtd help" }, 
-    { 0, "hf emrtd dump" }, 
-    { 1, "hf emrtd info" }, 
-    { 1, "hf emrtd list" }, 
-    { 1, "hf felica help" }, 
-    { 1, "hf felica list" }, 
-    { 0, "hf felica reader" }, 
-    { 0, "hf felica info" }, 
-    { 0, "hf felica sniff" }, 
-    { 0, "hf felica raw" }, 
-    { 0, "hf felica rdbl" }, 
-    { 0, "hf felica wrbl" }, 
-    { 0, "hf felica rqservice" }, 
-    { 0, "hf felica rqresponse" }, 
-    { 0, "hf felica scsvcode" }, 
-    { 0, "hf felica rqsyscode" }, 
-    { 0, "hf felica auth1" }, 
-    { 0, "hf felica auth2" }, 
-    { 0, "hf felica rqspecver" }, 
-    { 0, "hf felica resetmode" }, 
-    { 0, "hf felica litesim" }, 
-    { 0, "hf felica litedump" }, 
-    { 1, "hf fido help" }, 
-    { 1, "hf fido list" }, 
-    { 0, "hf fido info" }, 
-    { 0, "hf fido reg" }, 
-    { 0, "hf fido auth" }, 
-    { 0, "hf fido make" }, 
-    { 0, "hf fido assert" }, 
-    { 1, "hf fudan help" }, 
-    { 0, "hf fudan reader" }, 
-    { 0, "hf fudan dump" }, 
-    { 0, "hf fudan rdbl" }, 
-    { 1, "hf fudan view" }, 
-    { 0, "hf fudan wrbl" }, 
-    { 1, "hf gallagher help" }, 
-    { 0, "hf gallagher reader" }, 
-    { 0, "hf gallagher clone" }, 
-    { 0, "hf gallagher delete" }, 
-    { 1, "hf gallagher diversifykey" }, 
-    { 1, "hf gallagher decode" }, 
-    { 1, "hf ksx6924 help" }, 
-    { 0, "hf ksx6924 select" }, 
-    { 0, "hf ksx6924 info" }, 
-    { 0, "hf ksx6924 balance" }, 
-    { 0, "hf ksx6924 init" }, 
-    { 0, "hf ksx6924 prec" }, 
-    { 1, "hf jooki help" }, 
-    { 0, "hf jooki clone" }, 
-    { 1, "hf jooki decode" }, 
-    { 1, "hf jooki encode" }, 
-    { 0, "hf jooki sim" }, 
-    { 1, "hf iclass help" }, 
-    { 0, "hf iclass dump" }, 
-    { 1, "hf iclass info" }, 
-    { 1, "hf iclass list" }, 
-    { 0, "hf iclass rdbl" }, 
-    { 0, "hf iclass reader" }, 
-    { 0, "hf iclass restore" }, 
-    { 0, "hf iclass sniff" }, 
-    { 0, "hf iclass wrbl" }, 
-    { 0, "hf iclass chk" }, 
-    { 1, "hf iclass loclass" }, 
-    { 1, "hf iclass lookup" }, 
-    { 0, "hf iclass sim" }, 
-    { 0, "hf iclass eload" }, 
-    { 0, "hf iclass esave" }, 
-    { 0, "hf iclass eview" }, 
-    { 1, "hf iclass configcard" }, 
-    { 1, "hf iclass calcnewkey" }, 
-    { 1, "hf iclass encode" }, 
-    { 1, "hf iclass encrypt" }, 
-    { 1, "hf iclass decrypt" }, 
-    { 1, "hf iclass managekeys" }, 
-    { 1, "hf iclass permutekey" }, 
-    { 1, "hf iclass view" }, 
-    { 1, "hf legic help" }, 
-    { 0, "hf legic dump" }, 
-    { 0, "hf legic info" }, 
-    { 1, "hf legic list" }, 
-    { 0, "hf legic rdbl" }, 
-    { 0, "hf legic reader" }, 
-    { 0, "hf legic restore" }, 
-    { 0, "hf legic wipe" }, 
-    { 0, "hf legic wrbl" }, 
-    { 0, "hf legic sim" }, 
-    { 0, "hf legic eload" }, 
-    { 0, "hf legic esave" }, 
-    { 0, "hf legic eview" }, 
-    { 1, "hf legic crc" }, 
-    { 1, "hf legic view" }, 
-    { 1, "hf lto help" }, 
-    { 0, "hf lto dump" }, 
-    { 0, "hf lto info" }, 
-    { 1, "hf lto list" }, 
-    { 0, "hf lto rdbl" }, 
-    { 0, "hf lto reader" }, 
-    { 0, "hf lto restore" }, 
-    { 0, "hf lto wrbl" }, 
-    { 1, "hf mf help" }, 
-    { 1, "hf mf list" }, 
-    { 0, "hf mf darkside" }, 
-    { 0, "hf mf nested" }, 
-    { 1, "hf mf hardnested" }, 
-    { 0, "hf mf staticnested" }, 
-    { 0, "hf mf autopwn" }, 
-    { 0, "hf mf nack" }, 
-    { 0, "hf mf chk" }, 
-    { 0, "hf mf fchk" }, 
-    { 1, "hf mf decrypt" }, 
-    { 0, "hf mf supercard" }, 
-    { 0, "hf mf auth4" }, 
-    { 1, "hf mf acl" }, 
-    { 0, "hf mf dump" }, 
-    { 1, "hf mf mad" }, 
-    { 0, "hf mf personalize" }, 
-    { 0, "hf mf rdbl" }, 
-    { 0, "hf mf rdsc" }, 
-    { 0, "hf mf restore" }, 
-    { 0, "hf mf setmod" }, 
-    { 1, "hf mf value" }, 
-    { 1, "hf mf view" }, 
-    { 0, "hf mf wipe" }, 
-    { 0, "hf mf wrbl" }, 
-    { 0, "hf mf sim" }, 
-    { 0, "hf mf ecfill" }, 
-    { 0, "hf mf eclr" }, 
-    { 0, "hf mf egetblk" }, 
-    { 0, "hf mf egetsc" }, 
-    { 0, "hf mf ekeyprn" }, 
-    { 0, "hf mf eload" }, 
-    { 0, "hf mf esave" }, 
-    { 0, "hf mf esetblk" }, 
-    { 0, "hf mf eview" }, 
-    { 0, "hf mf cgetblk" }, 
-    { 0, "hf mf cgetsc" }, 
-    { 0, "hf mf cload" }, 
-    { 0, "hf mf csave" }, 
-    { 0, "hf mf csetblk" }, 
-    { 0, "hf mf csetuid" }, 
-    { 0, "hf mf cview" }, 
-    { 0, "hf mf cwipe" }, 
-    { 0, "hf mf gen3uid" }, 
-    { 0, "hf mf gen3blk" }, 
-    { 0, "hf mf gen3freeze" }, 
-    { 0, "hf mf ggetblk" }, 
-    { 0, "hf mf gload" }, 
-    { 0, "hf mf gsave" }, 
-    { 0, "hf mf gsetblk" }, 
-    { 0, "hf mf gview" }, 
-    { 0, "hf mf ndefformat" }, 
-    { 0, "hf mf ndefread" }, 
-    { 0, "hf mf ndefwrite" }, 
-    { 1, "hf mfp help" }, 
-    { 0, "hf mfp info" }, 
-    { 0, "hf mfp wrp" }, 
-    { 0, "hf mfp initp" }, 
-    { 0, "hf mfp commitp" }, 
-    { 0, "hf mfp auth" }, 
-    { 0, "hf mfp rdbl" }, 
-    { 0, "hf mfp rdsc" }, 
-    { 0, "hf mfp wrbl" }, 
-    { 0, "hf mfp chk" }, 
-    { 0, "hf mfp mad" }, 
-    { 0, "hf mfp ndefread" }, 
-    { 1, "hf mfu help" }, 
-    { 1, "hf mfu keygen" }, 
-    { 1, "hf mfu pwdgen" }, 
-    { 0, "hf mfu otptear" }, 
-    { 0, "hf mfu cauth" }, 
-    { 0, "hf mfu dump" }, 
-    { 0, "hf mfu info" }, 
-    { 0, "hf mfu ndefread" }, 
-    { 0, "hf mfu rdbl" }, 
-    { 0, "hf mfu restore" }, 
-    { 1, "hf mfu view" }, 
-    { 0, "hf mfu wrbl" }, 
-    { 0, "hf mfu eload" }, 
-    { 0, "hf mfu esave" }, 
-    { 0, "hf mfu eview" }, 
-    { 0, "hf mfu sim" }, 
-    { 0, "hf mfu setpwd" }, 
-    { 0, "hf mfu setuid" }, 
-    { 1, "hf mfdes help" }, 
-    { 0, "hf mfdes info" }, 
-    { 0, "hf mfdes getuid" }, 
-    { 0, "hf mfdes default" }, 
-    { 0, "hf mfdes auth" }, 
-    { 0, "hf mfdes chk" }, 
-    { 0, "hf mfdes detect" }, 
-    { 0, "hf mfdes freemem" }, 
-    { 0, "hf mfdes setconfig" }, 
-    { 0, "hf mfdes formatpicc" }, 
-    { 1, "hf mfdes list" }, 
-    { 0, "hf mfdes mad" }, 
-    { 0, "hf mfdes lsapp" }, 
-    { 0, "hf mfdes getaids" }, 
-    { 0, "hf mfdes getappnames" }, 
-    { 0, "hf mfdes bruteaid" }, 
-    { 0, "hf mfdes createapp" }, 
-    { 0, "hf mfdes deleteapp" }, 
-    { 0, "hf mfdes selectapp" }, 
-    { 0, "hf mfdes changekey" }, 
-    { 0, "hf mfdes chkeysettings" }, 
-    { 0, "hf mfdes getkeysettings" }, 
-    { 0, "hf mfdes getkeyversions" }, 
-    { 0, "hf mfdes getfileids" }, 
-    { 0, "hf mfdes getfileisoids" }, 
-    { 0, "hf mfdes lsfiles" }, 
-    { 0, "hf mfdes dump" }, 
-    { 0, "hf mfdes createfile" }, 
-    { 0, "hf mfdes createvaluefile" }, 
-    { 0, "hf mfdes createrecordfile" }, 
-    { 0, "hf mfdes createmacfile" }, 
-    { 0, "hf mfdes deletefile" }, 
-    { 0, "hf mfdes getfilesettings" }, 
-    { 0, "hf mfdes chfilesettings" }, 
-    { 0, "hf mfdes read" }, 
-    { 0, "hf mfdes write" }, 
-    { 0, "hf mfdes value" }, 
-    { 0, "hf mfdes clearrecfile" }, 
-    { 1, "hf mfdes test" }, 
-    { 1, "hf ntag424 help" }, 
-    { 0, "hf ntag424 info" }, 
-    { 0, "hf ntag424 sdm" }, 
-    { 1, "hf ntag424 view" }, 
-    { 1, "hf seos help" }, 
-    { 0, "hf seos info" }, 
-    { 1, "hf seos list" }, 
-    { 1, "hf st25ta help" }, 
-    { 0, "hf st25ta info" }, 
-    { 1, "hf st25ta list" }, 
-    { 1, "hf st25ta ndefread" }, 
-    { 0, "hf st25ta protect" }, 
-    { 0, "hf st25ta pwd" }, 
-    { 0, "hf st25ta sim" }, 
-    { 1, "hf thinfilm help" }, 
-    { 0, "hf thinfilm info" }, 
-    { 1, "hf thinfilm list" }, 
-    { 0, "hf thinfilm sim" }, 
-    { 1, "hf topaz help" }, 
-    { 0, "hf topaz dump" }, 
-    { 1, "hf topaz list" }, 
-    { 0, "hf topaz info" }, 
-    { 0, "hf topaz reader" }, 
-    { 0, "hf topaz sim" }, 
-    { 0, "hf topaz sniff" }, 
-    { 0, "hf topaz raw" }, 
-    { 0, "hf topaz rdbl" }, 
-    { 1, "hf topaz view" }, 
-    { 0, "hf topaz wrbl" }, 
-    { 1, "hf texkom help" }, 
-    { 0, "hf texkom reader" }, 
-    { 0, "hf texkom sim" }, 
-    { 1, "hf xerox help" }, 
-    { 0, "hf xerox info" }, 
-    { 0, "hf xerox reader" }, 
-    { 0, "hf xerox dump" }, 
-    { 1, "hf waveshare help" }, 
-    { 0, "hf waveshare loadbmp" }, 
-    { 1, "hw help" }, 
-    { 0, "hw break" }, 
-    { 1, "hw connect" }, 
-    { 0, "hw dbg" }, 
-    { 0, "hw detectreader" }, 
-    { 0, "hw fpgaoff" }, 
-    { 0, "hw lcd" }, 
-    { 0, "hw lcdreset" }, 
-    { 0, "hw ping" }, 
-    { 0, "hw readmem" }, 
-    { 0, "hw reset" }, 
-    { 0, "hw setlfdivisor" }, 
-    { 0, "hw setmux" }, 
-    { 0, "hw standalone" }, 
-    { 0, "hw status" }, 
-    { 0, "hw tearoff" }, 
-    { 0, "hw tia" }, 
-    { 0, "hw tune" }, 
-    { 1, "hw version" }, 
-    { 1, "lf help" }, 
-    { 0, "lf config" }, 
-    { 0, "lf cmdread" }, 
-    { 0, "lf read" }, 
-    { 1, "lf search" }, 
-    { 0, "lf sim" }, 
-    { 0, "lf simask" }, 
-    { 0, "lf simfsk" }, 
-    { 0, "lf simpsk" }, 
-    { 0, "lf simbidir" }, 
-    { 0, "lf sniff" }, 
-    { 0, "lf tune" }, 
-    { 1, "lf awid help" }, 
-    { 1, "lf awid demod" }, 
-    { 0, "lf awid reader" }, 
-    { 0, "lf awid clone" }, 
-    { 0, "lf awid sim" }, 
-    { 0, "lf awid brute" }, 
-    { 0, "lf awid watch" }, 
-    { 1, "lf cotag help" }, 
-    { 1, "lf cotag demod" }, 
-    { 0, "lf cotag reader" }, 
-    { 1, "lf destron help" }, 
-    { 1, "lf destron demod" }, 
-    { 0, "lf destron reader" }, 
-    { 0, "lf destron clone" }, 
-    { 0, "lf destron sim" }, 
-    { 1, "lf em help" }, 
-    { 1, "lf em 410x help" }, 
-    { 1, "lf em 410x demod" }, 
-    { 0, "lf em 410x reader" }, 
-    { 0, "lf em 410x sim" }, 
-    { 0, "lf em 410x brute" }, 
-    { 0, "lf em 410x watch" }, 
-    { 0, "lf em 410x spoof" }, 
-    { 0, "lf em 410x clone" }, 
-    { 1, "lf em 4x05 help" }, 
-    { 0, "lf em 4x05 brute" }, 
-    { 0, "lf em 4x05 chk" }, 
-    { 1, "lf em 4x05 demod" }, 
-    { 0, "lf em 4x05 dump" }, 
-    { 0, "lf em 4x05 info" }, 
-    { 0, "lf em 4x05 read" }, 
-    { 1, "lf em 4x05 sniff" }, 
-    { 0, "lf em 4x05 unlock" }, 
-    { 0, "lf em 4x05 wipe" }, 
-    { 0, "lf em 4x05 write" }, 
-    { 1, "lf em 4x50 help" }, 
-    { 0, "lf em 4x50 brute" }, 
-    { 0, "lf em 4x50 chk" }, 
-    { 0, "lf em 4x50 dump" }, 
-    { 0, "lf em 4x50 info" }, 
-    { 0, "lf em 4x50 login" }, 
-    { 0, "lf em 4x50 rdbl" }, 
-    { 0, "lf em 4x50 reader" }, 
-    { 0, "lf em 4x50 restore" }, 
-    { 0, "lf em 4x50 wrbl" }, 
-    { 0, "lf em 4x50 wrpwd" }, 
-    { 0, "lf em 4x50 wipe" }, 
-    { 0, "lf em 4x50 eload" }, 
-    { 0, "lf em 4x50 esave" }, 
-    { 0, "lf em 4x50 eview" }, 
-    { 0, "lf em 4x50 sim" }, 
-    { 1, "lf em 4x70 help" }, 
-    { 0, "lf em 4x70 info" }, 
-    { 0, "lf em 4x70 write" }, 
-    { 0, "lf em 4x70 unlock" }, 
-    { 0, "lf em 4x70 auth" }, 
-    { 0, "lf em 4x70 writepin" }, 
-    { 0, "lf em 4x70 writekey" }, 
-    { 1, "lf fdxb help" }, 
-    { 1, "lf fdxb demod" }, 
-    { 0, "lf fdxb reader" }, 
-    { 0, "lf fdxb clone" }, 
-    { 0, "lf fdxb sim" }, 
-    { 1, "lf gallagher help" }, 
-    { 1, "lf gallagher demod" }, 
-    { 0, "lf gallagher reader" }, 
-    { 0, "lf gallagher clone" }, 
-    { 0, "lf gallagher sim" }, 
-    { 1, "lf gproxii help" }, 
-    { 1, "lf gproxii demod" }, 
-    { 0, "lf gproxii reader" }, 
-    { 0, "lf gproxii clone" }, 
-    { 0, "lf gproxii sim" }, 
-    { 1, "lf hid help" }, 
-    { 1, "lf hid demod" }, 
-    { 0, "lf hid reader" }, 
-    { 0, "lf hid clone" }, 
-    { 0, "lf hid sim" }, 
-    { 0, "lf hid brute" }, 
-    { 0, "lf hid watch" }, 
-    { 1, "lf hitag help" }, 
-    { 0, "lf hitag eload" }, 
-    { 1, "lf hitag list" }, 
-    { 0, "lf hitag info" }, 
-    { 0, "lf hitag reader" }, 
-    { 0, "lf hitag sim" }, 
-    { 0, "lf hitag sniff" }, 
-    { 0, "lf hitag writer" }, 
-    { 0, "lf hitag dump" }, 
-    { 0, "lf hitag cc" }, 
-    { 1, "lf idteck help" }, 
-    { 1, "lf idteck demod" }, 
-    { 0, "lf idteck reader" }, 
-    { 0, "lf idteck clone" }, 
-    { 0, "lf idteck sim" }, 
-    { 1, "lf indala help" }, 
-    { 0, "lf indala brute" }, 
-    { 1, "lf indala demod" }, 
-    { 1, "lf indala altdemod" }, 
-    { 0, "lf indala reader" }, 
-    { 0, "lf indala clone" }, 
-    { 0, "lf indala sim" }, 
-    { 1, "lf io help" }, 
-    { 1, "lf io demod" }, 
-    { 0, "lf io reader" }, 
-    { 0, "lf io clone" }, 
-    { 0, "lf io sim" }, 
-    { 0, "lf io watch" }, 
-    { 1, "lf jablotron help" }, 
-    { 1, "lf jablotron demod" }, 
-    { 0, "lf jablotron reader" }, 
-    { 0, "lf jablotron clone" }, 
-    { 0, "lf jablotron sim" }, 
-    { 1, "lf keri help" }, 
-    { 1, "lf keri demod" }, 
-    { 0, "lf keri reader" }, 
-    { 0, "lf keri clone" }, 
-    { 0, "lf keri sim" }, 
-    { 1, "lf motorola help" }, 
-    { 1, "lf motorola demod" }, 
-    { 0, "lf motorola reader" }, 
-    { 0, "lf motorola clone" }, 
-    { 0, "lf motorola sim" }, 
-    { 1, "lf nedap help" }, 
-    { 1, "lf nedap demod" }, 
-    { 0, "lf nedap reader" }, 
-    { 0, "lf nedap clone" }, 
-    { 0, "lf nedap sim" }, 
-    { 1, "lf nexwatch help" }, 
-    { 1, "lf nexwatch demod" }, 
-    { 0, "lf nexwatch reader" }, 
-    { 0, "lf nexwatch clone" }, 
-    { 0, "lf nexwatch sim" }, 
-    { 1, "lf noralsy help" }, 
-    { 1, "lf noralsy demod" }, 
-    { 0, "lf noralsy reader" }, 
-    { 0, "lf noralsy clone" }, 
-    { 0, "lf noralsy sim" }, 
-    { 1, "lf pac help" }, 
-    { 1, "lf pac demod" }, 
-    { 0, "lf pac reader" }, 
-    { 0, "lf pac clone" }, 
-    { 0, "lf pac sim" }, 
-    { 1, "lf paradox help" }, 
-    { 1, "lf paradox demod" }, 
-    { 0, "lf paradox reader" }, 
-    { 0, "lf paradox clone" }, 
-    { 0, "lf paradox sim" }, 
-    { 1, "lf pcf7931 help" }, 
-    { 0, "lf pcf7931 reader" }, 
-    { 0, "lf pcf7931 write" }, 
-    { 1, "lf pcf7931 config" }, 
-    { 1, "lf presco help" }, 
-    { 1, "lf presco demod" }, 
-    { 0, "lf presco reader" }, 
-    { 0, "lf presco clone" }, 
-    { 0, "lf presco sim" }, 
-    { 1, "lf pyramid help" }, 
-    { 1, "lf pyramid demod" }, 
-    { 0, "lf pyramid reader" }, 
-    { 0, "lf pyramid clone" }, 
-    { 0, "lf pyramid sim" }, 
-    { 1, "lf securakey help" }, 
-    { 1, "lf securakey demod" }, 
-    { 0, "lf securakey reader" }, 
-    { 0, "lf securakey clone" }, 
-    { 0, "lf securakey sim" }, 
-    { 1, "lf ti help" }, 
-    { 1, "lf ti demod" }, 
-    { 0, "lf ti reader" }, 
-    { 0, "lf ti write" }, 
-    { 1, "lf t55xx help" }, 
-    { 0, "lf t55xx clonehelp" }, 
-    { 1, "lf t55xx config" }, 
-    { 0, "lf t55xx dangerraw" }, 
-    { 1, "lf t55xx detect" }, 
-    { 0, "lf t55xx deviceconfig" }, 
-    { 0, "lf t55xx dump" }, 
-    { 1, "lf t55xx info" }, 
-    { 0, "lf t55xx p1detect" }, 
-    { 0, "lf t55xx read" }, 
-    { 0, "lf t55xx resetread" }, 
-    { 0, "lf t55xx restore" }, 
-    { 1, "lf t55xx trace" }, 
-    { 0, "lf t55xx wakeup" }, 
-    { 0, "lf t55xx write" }, 
-    { 0, "lf t55xx bruteforce" }, 
-    { 0, "lf t55xx chk" }, 
-    { 0, "lf t55xx protect" }, 
-    { 0, "lf t55xx recoverpw" }, 
-    { 1, "lf t55xx sniff" }, 
-    { 0, "lf t55xx special" }, 
-    { 0, "lf t55xx wipe" }, 
-    { 1, "lf viking help" }, 
-    { 1, "lf viking demod" }, 
-    { 0, "lf viking reader" }, 
-    { 0, "lf viking clone" }, 
-    { 0, "lf viking sim" }, 
-    { 1, "lf visa2000 help" }, 
-    { 1, "lf visa2000 demod" }, 
-    { 0, "lf visa2000 reader" }, 
-    { 0, "lf visa2000 clone" }, 
-    { 0, "lf visa2000 sim" }, 
-    { 1, "mem help" }, 
-    { 0, "mem baudrate" }, 
-    { 0, "mem dump" }, 
-    { 0, "mem info" }, 
-    { 0, "mem load" }, 
-    { 0, "mem wipe" }, 
-    { 1, "mem spiffs help" }, 
-    { 0, "mem spiffs copy" }, 
-    { 0, "mem spiffs check" }, 
-    { 0, "mem spiffs dump" }, 
-    { 0, "mem spiffs info" }, 
-    { 0, "mem spiffs mount" }, 
-    { 0, "mem spiffs remove" }, 
-    { 0, "mem spiffs rename" }, 
-    { 0, "mem spiffs test" }, 
-    { 0, "mem spiffs tree" }, 
-    { 0, "mem spiffs unmount" }, 
-    { 0, "mem spiffs upload" }, 
-    { 0, "mem spiffs view" }, 
-    { 0, "mem spiffs wipe" }, 
-    { 1, "nfc help" }, 
-    { 1, "nfc decode" }, 
-    { 0, "nfc type1 read" }, 
-    { 1, "nfc type1 help" }, 
-    { 0, "nfc type2 read" }, 
-    { 1, "nfc type2 help" }, 
-    { 0, "nfc type4a format" }, 
-    { 0, "nfc type4a read" }, 
-    { 0, "nfc type4a write" }, 
-    { 0, "nfc type4a st25taread" }, 
-    { 1, "nfc type4a help" }, 
-    { 0, "nfc type4b read" }, 
-    { 1, "nfc type4b help" }, 
-    { 0, "nfc mf cformat" }, 
-    { 0, "nfc mf cread" }, 
-    { 0, "nfc mf cwrite" }, 
-    { 0, "nfc mf pread" }, 
-    { 1, "nfc mf help" }, 
-    { 0, "nfc barcode read" }, 
-    { 0, "nfc barcode sim" }, 
-    { 1, "nfc barcode help" }, 
-    { 1, "piv help" }, 
-    { 0, "piv select" }, 
-    { 0, "piv getdata" }, 
-    { 0, "piv authsign" }, 
-    { 0, "piv scan" }, 
-    { 1, "piv list" }, 
-    { 1, "smart help" }, 
-    { 1, "smart list" }, 
-    { 0, "smart info" }, 
-    { 0, "smart reader" }, 
-    { 0, "smart raw" }, 
-    { 1, "smart upgrade" }, 
-    { 0, "smart setclock" }, 
-    { 0, "smart brute" }, 
-    { 1, "script help" }, 
-    { 1, "script list" }, 
-    { 1, "script run" }, 
-    { 1, "trace help" }, 
-    { 1, "trace extract" }, 
-    { 1, "trace list" }, 
-    { 1, "trace load" }, 
-    { 1, "trace save" }, 
-    { 1, "usart help" }, 
-    { 0, "usart btpin" }, 
-    { 0, "usart btfactory" }, 
-    { 0, "usart tx" }, 
-    { 0, "usart rx" }, 
-    { 0, "usart txrx" }, 
-    { 0, "usart txhex" }, 
-    { 0, "usart rxhex" }, 
-    { 0, "usart config" }, 
-    { 1, "wiegand help" }, 
-    { 1, "wiegand list" }, 
-    { 1, "wiegand encode" }, 
-    { 1, "wiegand decode" }, 
+    { 1, "help" },
+    { 0, "auto" },
+    { 1, "clear" },
+    { 1, "hints" },
+    { 1, "msleep" },
+    { 1, "rem" },
+    { 1, "quit" },
+    { 1, "exit" },
+    { 1, "prefs help" },
+    { 1, "prefs show" },
+    { 1, "prefs get barmode" },
+    { 1, "prefs get clientdebug" },
+    { 1, "prefs get clientdelay" },
+    { 1, "prefs get color" },
+    { 1, "prefs get savepaths" },
+    { 1, "prefs get emoji" },
+    { 1, "prefs get hints" },
+    { 1, "prefs get output" },
+    { 1, "prefs get plotsliders" },
+    { 1, "prefs set help" },
+    { 1, "prefs set barmode" },
+    { 1, "prefs set clientdebug" },
+    { 1, "prefs set clientdelay" },
+    { 1, "prefs set color" },
+    { 1, "prefs set emoji" },
+    { 1, "prefs set hints" },
+    { 1, "prefs set savepaths" },
+    { 1, "prefs set output" },
+    { 1, "prefs set plotsliders" },
+    { 1, "analyse help" },
+    { 1, "analyse lcr" },
+    { 1, "analyse crc" },
+    { 1, "analyse chksum" },
+    { 1, "analyse dates" },
+    { 1, "analyse lfsr" },
+    { 1, "analyse a" },
+    { 1, "analyse nuid" },
+    { 1, "analyse demodbuff" },
+    { 1, "analyse freq" },
+    { 1, "analyse foo" },
+    { 1, "analyse units" },
+    { 1, "data help" },
+    { 1, "data biphaserawdecode" },
+    { 1, "data detectclock" },
+    { 1, "data fsktonrz" },
+    { 1, "data manrawdecode" },
+    { 1, "data modulation" },
+    { 1, "data rawdemod" },
+    { 1, "data askedgedetect" },
+    { 1, "data autocorr" },
+    { 1, "data dirthreshold" },
+    { 1, "data decimate" },
+    { 1, "data undecimate" },
+    { 1, "data hide" },
+    { 1, "data hpf" },
+    { 1, "data iir" },
+    { 1, "data grid" },
+    { 1, "data ltrim" },
+    { 1, "data mtrim" },
+    { 1, "data norm" },
+    { 1, "data plot" },
+    { 1, "data rtrim" },
+    { 1, "data setgraphmarkers" },
+    { 1, "data shiftgraphzero" },
+    { 1, "data timescale" },
+    { 1, "data zerocrossings" },
+    { 1, "data convertbitstream" },
+    { 1, "data getbitstream" },
+    { 1, "data asn1" },
+    { 1, "data bin2hex" },
+    { 0, "data bitsamples" },
+    { 1, "data clear" },
+    { 1, "data diff" },
+    { 0, "data hexsamples" },
+    { 1, "data hex2bin" },
+    { 1, "data load" },
+    { 1, "data print" },
+    { 0, "data samples" },
+    { 1, "data save" },
+    { 1, "data setdebugmode" },
+    { 0, "data tune" },
+    { 1, "emv help" },
+    { 0, "emv exec" },
+    { 0, "emv pse" },
+    { 0, "emv search" },
+    { 0, "emv select" },
+    { 0, "emv gpo" },
+    { 0, "emv readrec" },
+    { 0, "emv genac" },
+    { 0, "emv challenge" },
+    { 0, "emv intauth" },
+    { 0, "emv scan" },
+    { 1, "emv test" },
+    { 1, "emv list" },
+    { 0, "emv roca" },
+    { 1, "hf help" },
+    { 1, "hf list" },
+    { 0, "hf plot" },
+    { 0, "hf tune" },
+    { 1, "hf search" },
+    { 0, "hf sniff" },
+    { 1, "hf 14a help" },
+    { 1, "hf 14a list" },
+    { 0, "hf 14a antifuzz" },
+    { 0, "hf 14a config" },
+    { 0, "hf 14a cuids" },
+    { 0, "hf 14a info" },
+    { 0, "hf 14a sim" },
+    { 0, "hf 14a sniff" },
+    { 0, "hf 14a raw" },
+    { 0, "hf 14a reader" },
+    { 0, "hf 14a apdu" },
+    { 0, "hf 14a apdufind" },
+    { 0, "hf 14a chaining" },
+    { 0, "hf 14a ndefformat" },
+    { 0, "hf 14a ndefread" },
+    { 0, "hf 14a ndefwrite" },
+    { 1, "hf 14b help" },
+    { 0, "hf 14b apdu" },
+    { 0, "hf 14b dump" },
+    { 0, "hf 14b info" },
+    { 1, "hf 14b list" },
+    { 0, "hf 14b ndefread" },
+    { 0, "hf 14b raw" },
+    { 0, "hf 14b reader" },
+    { 0, "hf 14b sim" },
+    { 0, "hf 14b sniff" },
+    { 0, "hf 14b rdbl" },
+    { 0, "hf 14b sriwrite" },
+    { 1, "hf 14b view" },
+    { 1, "hf 15 help" },
+    { 1, "hf 15 list" },
+    { 1, "hf 15 demod" },
+    { 0, "hf 15 dump" },
+    { 0, "hf 15 info" },
+    { 0, "hf 15 sniff" },
+    { 0, "hf 15 raw" },
+    { 0, "hf 15 rdbl" },
+    { 0, "hf 15 rdmulti" },
+    { 0, "hf 15 reader" },
+    { 0, "hf 15 restore" },
+    { 0, "hf 15 samples" },
+    { 0, "hf 15 eload" },
+    { 0, "hf 15 esave" },
+    { 0, "hf 15 eview" },
+    { 0, "hf 15 sim" },
+    { 0, "hf 15 slixdisable" },
+    { 0, "hf 15 wrbl" },
+    { 0, "hf 15 findafi" },
+    { 0, "hf 15 writeafi" },
+    { 0, "hf 15 writedsfid" },
+    { 0, "hf 15 csetuid" },
+    { 1, "hf cipurse help" },
+    { 0, "hf cipurse info" },
+    { 0, "hf cipurse select" },
+    { 0, "hf cipurse auth" },
+    { 0, "hf cipurse read" },
+    { 0, "hf cipurse write" },
+    { 0, "hf cipurse aread" },
+    { 0, "hf cipurse awrite" },
+    { 0, "hf cipurse formatall" },
+    { 0, "hf cipurse create" },
+    { 0, "hf cipurse delete" },
+    { 0, "hf cipurse updkey" },
+    { 0, "hf cipurse updakey" },
+    { 0, "hf cipurse default" },
+    { 1, "hf cipurse test" },
+    { 1, "hf epa help" },
+    { 0, "hf epa cnonces" },
+    { 0, "hf epa replay" },
+    { 0, "hf epa sim" },
+    { 1, "hf emrtd help" },
+    { 0, "hf emrtd dump" },
+    { 1, "hf emrtd info" },
+    { 1, "hf emrtd list" },
+    { 1, "hf felica help" },
+    { 1, "hf felica list" },
+    { 0, "hf felica reader" },
+    { 0, "hf felica info" },
+    { 0, "hf felica sniff" },
+    { 0, "hf felica raw" },
+    { 0, "hf felica rdbl" },
+    { 0, "hf felica wrbl" },
+    { 0, "hf felica rqservice" },
+    { 0, "hf felica rqresponse" },
+    { 0, "hf felica scsvcode" },
+    { 0, "hf felica rqsyscode" },
+    { 0, "hf felica auth1" },
+    { 0, "hf felica auth2" },
+    { 0, "hf felica rqspecver" },
+    { 0, "hf felica resetmode" },
+    { 0, "hf felica litesim" },
+    { 0, "hf felica litedump" },
+    { 1, "hf fido help" },
+    { 1, "hf fido list" },
+    { 0, "hf fido info" },
+    { 0, "hf fido reg" },
+    { 0, "hf fido auth" },
+    { 0, "hf fido make" },
+    { 0, "hf fido assert" },
+    { 1, "hf fudan help" },
+    { 0, "hf fudan reader" },
+    { 0, "hf fudan dump" },
+    { 0, "hf fudan rdbl" },
+    { 1, "hf fudan view" },
+    { 0, "hf fudan wrbl" },
+    { 1, "hf gallagher help" },
+    { 0, "hf gallagher reader" },
+    { 0, "hf gallagher clone" },
+    { 0, "hf gallagher delete" },
+    { 1, "hf gallagher diversifykey" },
+    { 1, "hf gallagher decode" },
+    { 1, "hf ksx6924 help" },
+    { 0, "hf ksx6924 select" },
+    { 0, "hf ksx6924 info" },
+    { 0, "hf ksx6924 balance" },
+    { 0, "hf ksx6924 init" },
+    { 0, "hf ksx6924 prec" },
+    { 1, "hf jooki help" },
+    { 0, "hf jooki clone" },
+    { 1, "hf jooki decode" },
+    { 1, "hf jooki encode" },
+    { 0, "hf jooki sim" },
+    { 1, "hf iclass help" },
+    { 0, "hf iclass dump" },
+    { 1, "hf iclass info" },
+    { 1, "hf iclass list" },
+    { 0, "hf iclass rdbl" },
+    { 0, "hf iclass reader" },
+    { 0, "hf iclass restore" },
+    { 0, "hf iclass sniff" },
+    { 0, "hf iclass wrbl" },
+    { 0, "hf iclass chk" },
+    { 1, "hf iclass loclass" },
+    { 1, "hf iclass lookup" },
+    { 0, "hf iclass sim" },
+    { 0, "hf iclass eload" },
+    { 0, "hf iclass esave" },
+    { 0, "hf iclass eview" },
+    { 1, "hf iclass configcard" },
+    { 1, "hf iclass calcnewkey" },
+    { 1, "hf iclass encode" },
+    { 1, "hf iclass encrypt" },
+    { 1, "hf iclass decrypt" },
+    { 1, "hf iclass managekeys" },
+    { 1, "hf iclass permutekey" },
+    { 1, "hf iclass view" },
+    { 1, "hf legic help" },
+    { 0, "hf legic dump" },
+    { 0, "hf legic info" },
+    { 1, "hf legic list" },
+    { 0, "hf legic rdbl" },
+    { 0, "hf legic reader" },
+    { 0, "hf legic restore" },
+    { 0, "hf legic wipe" },
+    { 0, "hf legic wrbl" },
+    { 0, "hf legic sim" },
+    { 0, "hf legic eload" },
+    { 0, "hf legic esave" },
+    { 0, "hf legic eview" },
+    { 1, "hf legic crc" },
+    { 1, "hf legic view" },
+    { 1, "hf lto help" },
+    { 0, "hf lto dump" },
+    { 0, "hf lto info" },
+    { 1, "hf lto list" },
+    { 0, "hf lto rdbl" },
+    { 0, "hf lto reader" },
+    { 0, "hf lto restore" },
+    { 0, "hf lto wrbl" },
+    { 1, "hf mf help" },
+    { 1, "hf mf list" },
+    { 0, "hf mf darkside" },
+    { 0, "hf mf nested" },
+    { 1, "hf mf hardnested" },
+    { 0, "hf mf staticnested" },
+    { 0, "hf mf autopwn" },
+    { 0, "hf mf nack" },
+    { 0, "hf mf chk" },
+    { 0, "hf mf fchk" },
+    { 1, "hf mf decrypt" },
+    { 0, "hf mf supercard" },
+    { 0, "hf mf auth4" },
+    { 1, "hf mf acl" },
+    { 0, "hf mf dump" },
+    { 1, "hf mf mad" },
+    { 0, "hf mf personalize" },
+    { 0, "hf mf rdbl" },
+    { 0, "hf mf rdsc" },
+    { 0, "hf mf restore" },
+    { 0, "hf mf setmod" },
+    { 1, "hf mf value" },
+    { 1, "hf mf view" },
+    { 0, "hf mf wipe" },
+    { 0, "hf mf wrbl" },
+    { 0, "hf mf sim" },
+    { 0, "hf mf ecfill" },
+    { 0, "hf mf eclr" },
+    { 0, "hf mf egetblk" },
+    { 0, "hf mf egetsc" },
+    { 0, "hf mf ekeyprn" },
+    { 0, "hf mf eload" },
+    { 0, "hf mf esave" },
+    { 0, "hf mf esetblk" },
+    { 0, "hf mf eview" },
+    { 0, "hf mf cgetblk" },
+    { 0, "hf mf cgetsc" },
+    { 0, "hf mf cload" },
+    { 0, "hf mf csave" },
+    { 0, "hf mf csetblk" },
+    { 0, "hf mf csetuid" },
+    { 0, "hf mf cview" },
+    { 0, "hf mf cwipe" },
+    { 0, "hf mf gen3uid" },
+    { 0, "hf mf gen3blk" },
+    { 0, "hf mf gen3freeze" },
+    { 0, "hf mf ggetblk" },
+    { 0, "hf mf gload" },
+    { 0, "hf mf gsave" },
+    { 0, "hf mf gsetblk" },
+    { 0, "hf mf gview" },
+    { 0, "hf mf ndefformat" },
+    { 0, "hf mf ndefread" },
+    { 0, "hf mf ndefwrite" },
+    { 1, "hf mfp help" },
+    { 0, "hf mfp info" },
+    { 0, "hf mfp wrp" },
+    { 0, "hf mfp initp" },
+    { 0, "hf mfp commitp" },
+    { 0, "hf mfp auth" },
+    { 0, "hf mfp rdbl" },
+    { 0, "hf mfp rdsc" },
+    { 0, "hf mfp wrbl" },
+    { 0, "hf mfp chk" },
+    { 0, "hf mfp mad" },
+    { 0, "hf mfp ndefread" },
+    { 1, "hf mfu help" },
+    { 1, "hf mfu keygen" },
+    { 1, "hf mfu pwdgen" },
+    { 0, "hf mfu otptear" },
+    { 0, "hf mfu cauth" },
+    { 0, "hf mfu dump" },
+    { 0, "hf mfu info" },
+    { 0, "hf mfu ndefread" },
+    { 0, "hf mfu rdbl" },
+    { 0, "hf mfu restore" },
+    { 1, "hf mfu view" },
+    { 0, "hf mfu wrbl" },
+    { 0, "hf mfu eload" },
+    { 0, "hf mfu esave" },
+    { 0, "hf mfu eview" },
+    { 0, "hf mfu sim" },
+    { 0, "hf mfu setpwd" },
+    { 0, "hf mfu setuid" },
+    { 1, "hf mfdes help" },
+    { 0, "hf mfdes info" },
+    { 0, "hf mfdes getuid" },
+    { 0, "hf mfdes default" },
+    { 0, "hf mfdes auth" },
+    { 0, "hf mfdes chk" },
+    { 0, "hf mfdes detect" },
+    { 0, "hf mfdes freemem" },
+    { 0, "hf mfdes setconfig" },
+    { 0, "hf mfdes formatpicc" },
+    { 1, "hf mfdes list" },
+    { 0, "hf mfdes mad" },
+    { 0, "hf mfdes lsapp" },
+    { 0, "hf mfdes getaids" },
+    { 0, "hf mfdes getappnames" },
+    { 0, "hf mfdes bruteaid" },
+    { 0, "hf mfdes createapp" },
+    { 0, "hf mfdes deleteapp" },
+    { 0, "hf mfdes selectapp" },
+    { 0, "hf mfdes changekey" },
+    { 0, "hf mfdes chkeysettings" },
+    { 0, "hf mfdes getkeysettings" },
+    { 0, "hf mfdes getkeyversions" },
+    { 0, "hf mfdes getfileids" },
+    { 0, "hf mfdes getfileisoids" },
+    { 0, "hf mfdes lsfiles" },
+    { 0, "hf mfdes dump" },
+    { 0, "hf mfdes createfile" },
+    { 0, "hf mfdes createvaluefile" },
+    { 0, "hf mfdes createrecordfile" },
+    { 0, "hf mfdes createmacfile" },
+    { 0, "hf mfdes deletefile" },
+    { 0, "hf mfdes getfilesettings" },
+    { 0, "hf mfdes chfilesettings" },
+    { 0, "hf mfdes read" },
+    { 0, "hf mfdes write" },
+    { 0, "hf mfdes value" },
+    { 0, "hf mfdes clearrecfile" },
+    { 1, "hf mfdes test" },
+    { 1, "hf ntag424 help" },
+    { 0, "hf ntag424 info" },
+    { 0, "hf ntag424 sdm" },
+    { 1, "hf ntag424 view" },
+    { 1, "hf seos help" },
+    { 0, "hf seos info" },
+    { 1, "hf seos list" },
+    { 1, "hf st25ta help" },
+    { 0, "hf st25ta info" },
+    { 1, "hf st25ta list" },
+    { 1, "hf st25ta ndefread" },
+    { 0, "hf st25ta protect" },
+    { 0, "hf st25ta pwd" },
+    { 0, "hf st25ta sim" },
+    { 1, "hf thinfilm help" },
+    { 0, "hf thinfilm info" },
+    { 1, "hf thinfilm list" },
+    { 0, "hf thinfilm sim" },
+    { 1, "hf topaz help" },
+    { 0, "hf topaz dump" },
+    { 1, "hf topaz list" },
+    { 0, "hf topaz info" },
+    { 0, "hf topaz reader" },
+    { 0, "hf topaz sim" },
+    { 0, "hf topaz sniff" },
+    { 0, "hf topaz raw" },
+    { 0, "hf topaz rdbl" },
+    { 1, "hf topaz view" },
+    { 0, "hf topaz wrbl" },
+    { 1, "hf texkom help" },
+    { 0, "hf texkom reader" },
+    { 0, "hf texkom sim" },
+    { 1, "hf xerox help" },
+    { 0, "hf xerox info" },
+    { 0, "hf xerox reader" },
+    { 0, "hf xerox dump" },
+    { 1, "hf waveshare help" },
+    { 0, "hf waveshare loadbmp" },
+    { 1, "hw help" },
+    { 0, "hw break" },
+    { 1, "hw connect" },
+    { 0, "hw dbg" },
+    { 0, "hw detectreader" },
+    { 0, "hw fpgaoff" },
+    { 0, "hw lcd" },
+    { 0, "hw lcdreset" },
+    { 0, "hw ping" },
+    { 0, "hw readmem" },
+    { 0, "hw reset" },
+    { 0, "hw setlfdivisor" },
+    { 0, "hw setmux" },
+    { 0, "hw standalone" },
+    { 0, "hw status" },
+    { 0, "hw tearoff" },
+    { 0, "hw tia" },
+    { 0, "hw tune" },
+    { 1, "hw version" },
+    { 1, "lf help" },
+    { 0, "lf config" },
+    { 0, "lf cmdread" },
+    { 0, "lf read" },
+    { 1, "lf search" },
+    { 0, "lf sim" },
+    { 0, "lf simask" },
+    { 0, "lf simfsk" },
+    { 0, "lf simpsk" },
+    { 0, "lf simbidir" },
+    { 0, "lf sniff" },
+    { 0, "lf tune" },
+    { 1, "lf awid help" },
+    { 1, "lf awid demod" },
+    { 0, "lf awid reader" },
+    { 0, "lf awid clone" },
+    { 0, "lf awid sim" },
+    { 0, "lf awid brute" },
+    { 0, "lf awid watch" },
+    { 1, "lf cotag help" },
+    { 1, "lf cotag demod" },
+    { 0, "lf cotag reader" },
+    { 1, "lf destron help" },
+    { 1, "lf destron demod" },
+    { 0, "lf destron reader" },
+    { 0, "lf destron clone" },
+    { 0, "lf destron sim" },
+    { 1, "lf em help" },
+    { 1, "lf em 410x help" },
+    { 1, "lf em 410x demod" },
+    { 0, "lf em 410x reader" },
+    { 0, "lf em 410x sim" },
+    { 0, "lf em 410x brute" },
+    { 0, "lf em 410x watch" },
+    { 0, "lf em 410x spoof" },
+    { 0, "lf em 410x clone" },
+    { 1, "lf em 4x05 help" },
+    { 0, "lf em 4x05 brute" },
+    { 0, "lf em 4x05 chk" },
+    { 1, "lf em 4x05 demod" },
+    { 0, "lf em 4x05 dump" },
+    { 0, "lf em 4x05 info" },
+    { 0, "lf em 4x05 read" },
+    { 1, "lf em 4x05 sniff" },
+    { 0, "lf em 4x05 unlock" },
+    { 0, "lf em 4x05 wipe" },
+    { 0, "lf em 4x05 write" },
+    { 1, "lf em 4x50 help" },
+    { 0, "lf em 4x50 brute" },
+    { 0, "lf em 4x50 chk" },
+    { 0, "lf em 4x50 dump" },
+    { 0, "lf em 4x50 info" },
+    { 0, "lf em 4x50 login" },
+    { 0, "lf em 4x50 rdbl" },
+    { 0, "lf em 4x50 reader" },
+    { 0, "lf em 4x50 restore" },
+    { 0, "lf em 4x50 wrbl" },
+    { 0, "lf em 4x50 wrpwd" },
+    { 0, "lf em 4x50 wipe" },
+    { 0, "lf em 4x50 eload" },
+    { 0, "lf em 4x50 esave" },
+    { 0, "lf em 4x50 eview" },
+    { 0, "lf em 4x50 sim" },
+    { 1, "lf em 4x70 help" },
+    { 0, "lf em 4x70 info" },
+    { 0, "lf em 4x70 write" },
+    { 0, "lf em 4x70 unlock" },
+    { 0, "lf em 4x70 auth" },
+    { 0, "lf em 4x70 writepin" },
+    { 0, "lf em 4x70 writekey" },
+    { 1, "lf fdxb help" },
+    { 1, "lf fdxb demod" },
+    { 0, "lf fdxb reader" },
+    { 0, "lf fdxb clone" },
+    { 0, "lf fdxb sim" },
+    { 1, "lf gallagher help" },
+    { 1, "lf gallagher demod" },
+    { 0, "lf gallagher reader" },
+    { 0, "lf gallagher clone" },
+    { 0, "lf gallagher sim" },
+    { 1, "lf gproxii help" },
+    { 1, "lf gproxii demod" },
+    { 0, "lf gproxii reader" },
+    { 0, "lf gproxii clone" },
+    { 0, "lf gproxii sim" },
+    { 1, "lf hid help" },
+    { 1, "lf hid demod" },
+    { 0, "lf hid reader" },
+    { 0, "lf hid clone" },
+    { 0, "lf hid sim" },
+    { 0, "lf hid brute" },
+    { 0, "lf hid watch" },
+    { 1, "lf hitag help" },
+    { 0, "lf hitag eload" },
+    { 1, "lf hitag list" },
+    { 0, "lf hitag info" },
+    { 0, "lf hitag reader" },
+    { 0, "lf hitag sim" },
+    { 0, "lf hitag sniff" },
+    { 0, "lf hitag writer" },
+    { 0, "lf hitag dump" },
+    { 0, "lf hitag cc" },
+    { 1, "lf idteck help" },
+    { 1, "lf idteck demod" },
+    { 0, "lf idteck reader" },
+    { 0, "lf idteck clone" },
+    { 0, "lf idteck sim" },
+    { 1, "lf indala help" },
+    { 0, "lf indala brute" },
+    { 1, "lf indala demod" },
+    { 1, "lf indala altdemod" },
+    { 0, "lf indala reader" },
+    { 0, "lf indala clone" },
+    { 0, "lf indala sim" },
+    { 1, "lf io help" },
+    { 1, "lf io demod" },
+    { 0, "lf io reader" },
+    { 0, "lf io clone" },
+    { 0, "lf io sim" },
+    { 0, "lf io watch" },
+    { 1, "lf jablotron help" },
+    { 1, "lf jablotron demod" },
+    { 0, "lf jablotron reader" },
+    { 0, "lf jablotron clone" },
+    { 0, "lf jablotron sim" },
+    { 1, "lf keri help" },
+    { 1, "lf keri demod" },
+    { 0, "lf keri reader" },
+    { 0, "lf keri clone" },
+    { 0, "lf keri sim" },
+    { 1, "lf motorola help" },
+    { 1, "lf motorola demod" },
+    { 0, "lf motorola reader" },
+    { 0, "lf motorola clone" },
+    { 0, "lf motorola sim" },
+    { 1, "lf nedap help" },
+    { 1, "lf nedap demod" },
+    { 0, "lf nedap reader" },
+    { 0, "lf nedap clone" },
+    { 0, "lf nedap sim" },
+    { 1, "lf nexwatch help" },
+    { 1, "lf nexwatch demod" },
+    { 0, "lf nexwatch reader" },
+    { 0, "lf nexwatch clone" },
+    { 0, "lf nexwatch sim" },
+    { 1, "lf noralsy help" },
+    { 1, "lf noralsy demod" },
+    { 0, "lf noralsy reader" },
+    { 0, "lf noralsy clone" },
+    { 0, "lf noralsy sim" },
+    { 1, "lf pac help" },
+    { 1, "lf pac demod" },
+    { 0, "lf pac reader" },
+    { 0, "lf pac clone" },
+    { 0, "lf pac sim" },
+    { 1, "lf paradox help" },
+    { 1, "lf paradox demod" },
+    { 0, "lf paradox reader" },
+    { 0, "lf paradox clone" },
+    { 0, "lf paradox sim" },
+    { 1, "lf pcf7931 help" },
+    { 0, "lf pcf7931 reader" },
+    { 0, "lf pcf7931 write" },
+    { 1, "lf pcf7931 config" },
+    { 1, "lf presco help" },
+    { 1, "lf presco demod" },
+    { 0, "lf presco reader" },
+    { 0, "lf presco clone" },
+    { 0, "lf presco sim" },
+    { 1, "lf pyramid help" },
+    { 1, "lf pyramid demod" },
+    { 0, "lf pyramid reader" },
+    { 0, "lf pyramid clone" },
+    { 0, "lf pyramid sim" },
+    { 1, "lf securakey help" },
+    { 1, "lf securakey demod" },
+    { 0, "lf securakey reader" },
+    { 0, "lf securakey clone" },
+    { 0, "lf securakey sim" },
+    { 1, "lf ti help" },
+    { 1, "lf ti demod" },
+    { 0, "lf ti reader" },
+    { 0, "lf ti write" },
+    { 1, "lf t55xx help" },
+    { 0, "lf t55xx clonehelp" },
+    { 1, "lf t55xx config" },
+    { 0, "lf t55xx dangerraw" },
+    { 1, "lf t55xx detect" },
+    { 0, "lf t55xx deviceconfig" },
+    { 0, "lf t55xx dump" },
+    { 1, "lf t55xx info" },
+    { 0, "lf t55xx p1detect" },
+    { 0, "lf t55xx read" },
+    { 0, "lf t55xx resetread" },
+    { 0, "lf t55xx restore" },
+    { 1, "lf t55xx trace" },
+    { 0, "lf t55xx wakeup" },
+    { 0, "lf t55xx write" },
+    { 0, "lf t55xx bruteforce" },
+    { 0, "lf t55xx chk" },
+    { 0, "lf t55xx protect" },
+    { 0, "lf t55xx recoverpw" },
+    { 1, "lf t55xx sniff" },
+    { 0, "lf t55xx special" },
+    { 0, "lf t55xx wipe" },
+    { 1, "lf viking help" },
+    { 1, "lf viking demod" },
+    { 0, "lf viking reader" },
+    { 0, "lf viking clone" },
+    { 0, "lf viking sim" },
+    { 1, "lf visa2000 help" },
+    { 1, "lf visa2000 demod" },
+    { 0, "lf visa2000 reader" },
+    { 0, "lf visa2000 clone" },
+    { 0, "lf visa2000 sim" },
+    { 1, "mem help" },
+    { 0, "mem baudrate" },
+    { 0, "mem dump" },
+    { 0, "mem info" },
+    { 0, "mem load" },
+    { 0, "mem wipe" },
+    { 1, "mem spiffs help" },
+    { 0, "mem spiffs copy" },
+    { 0, "mem spiffs check" },
+    { 0, "mem spiffs dump" },
+    { 0, "mem spiffs info" },
+    { 0, "mem spiffs mount" },
+    { 0, "mem spiffs remove" },
+    { 0, "mem spiffs rename" },
+    { 0, "mem spiffs test" },
+    { 0, "mem spiffs tree" },
+    { 0, "mem spiffs unmount" },
+    { 0, "mem spiffs upload" },
+    { 0, "mem spiffs view" },
+    { 0, "mem spiffs wipe" },
+    { 1, "nfc help" },
+    { 1, "nfc decode" },
+    { 0, "nfc type1 read" },
+    { 1, "nfc type1 help" },
+    { 0, "nfc type2 read" },
+    { 1, "nfc type2 help" },
+    { 0, "nfc type4a format" },
+    { 0, "nfc type4a read" },
+    { 0, "nfc type4a write" },
+    { 0, "nfc type4a st25taread" },
+    { 1, "nfc type4a help" },
+    { 0, "nfc type4b read" },
+    { 1, "nfc type4b help" },
+    { 0, "nfc mf cformat" },
+    { 0, "nfc mf cread" },
+    { 0, "nfc mf cwrite" },
+    { 0, "nfc mf pread" },
+    { 1, "nfc mf help" },
+    { 0, "nfc barcode read" },
+    { 0, "nfc barcode sim" },
+    { 1, "nfc barcode help" },
+    { 1, "piv help" },
+    { 0, "piv select" },
+    { 0, "piv getdata" },
+    { 0, "piv authsign" },
+    { 0, "piv scan" },
+    { 1, "piv list" },
+    { 1, "smart help" },
+    { 1, "smart list" },
+    { 0, "smart info" },
+    { 0, "smart reader" },
+    { 0, "smart raw" },
+    { 1, "smart upgrade" },
+    { 0, "smart setclock" },
+    { 0, "smart brute" },
+    { 1, "script help" },
+    { 1, "script list" },
+    { 1, "script run" },
+    { 1, "trace help" },
+    { 1, "trace extract" },
+    { 1, "trace list" },
+    { 1, "trace load" },
+    { 1, "trace save" },
+    { 1, "usart help" },
+    { 0, "usart btpin" },
+    { 0, "usart btfactory" },
+    { 0, "usart tx" },
+    { 0, "usart rx" },
+    { 0, "usart txrx" },
+    { 0, "usart txhex" },
+    { 0, "usart rxhex" },
+    { 0, "usart config" },
+    { 1, "wiegand help" },
+    { 1, "wiegand list" },
+    { 1, "wiegand encode" },
+    { 1, "wiegand decode" },
     {0, NULL}
 };
 
@@ -779,4 +779,4 @@ const static vocabulory_t vocabulory[] = {
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif

From dbe53506b579665f82b773c97f010e8d5f7b592f Mon Sep 17 00:00:00 2001
From: colonelborkmundus <colonelborkmundus@gmail.com>
Date: Wed, 18 Jan 2023 12:52:10 -0500
Subject: [PATCH 07/19] added additional keys to graduate hotel card

---
 client/dictionaries/mfc_default_keys.dic | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic
index 433a91ce5..9255031de 100644
--- a/client/dictionaries/mfc_default_keys.dic
+++ b/client/dictionaries/mfc_default_keys.dic
@@ -1919,9 +1919,10 @@ D144BD193063
 0D258FE90296
 17193709ADF4
 #
-# mifare classic 1K - marriott
-
-
+# mifare classic 1k - westin
+B578F38A5C61
+#
+# mifare classic 1k
 
 
 

From 88d242d10ab80c5643e78201aa60cd03af144d33 Mon Sep 17 00:00:00 2001
From: colonelborkmundus <colonelborkmundus@gmail.com>
Date: Wed, 18 Jan 2023 13:36:50 -0500
Subject: [PATCH 08/19] yo dawg i heard you like keys so i added more keys

---
 client/dictionaries/mfc_default_keys.dic | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic
index 9255031de..c4032b081 100644
--- a/client/dictionaries/mfc_default_keys.dic
+++ b/client/dictionaries/mfc_default_keys.dic
@@ -1918,12 +1918,17 @@ D144BD193063
 # mifare classic 1k - graduate hotel
 0D258FE90296
 17193709ADF4
+C49DAE1C6049
+209A2B910545
+752FBB5B7B45
 #
 # mifare classic 1k - westin
 B578F38A5C61
 #
-# mifare classic 1k
-
-
-
-
+# mifare classic 1k EV1 - marriott
+D01AFEEB890A
+7B4DFC6D6525
+23C9FDD9A366
+3119A70628EB
+30AAD6A711EF
+1330824CD356
\ No newline at end of file

From de3514dc840a823a04b4faec9f76ceb77162ed22 Mon Sep 17 00:00:00 2001
From: colonelborkmundus <colonelborkmundus@gmail.com>
Date: Wed, 18 Jan 2023 13:53:08 -0500
Subject: [PATCH 09/19] added more keys

---
 client/dictionaries/mfc_default_keys.dic | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic
index c4032b081..3ba6ccc10 100644
--- a/client/dictionaries/mfc_default_keys.dic
+++ b/client/dictionaries/mfc_default_keys.dic
@@ -1924,6 +1924,8 @@ C49DAE1C6049
 #
 # mifare classic 1k - westin
 B578F38A5C61
+8C29F8320617
+5697519A8F02
 #
 # mifare classic 1k EV1 - marriott
 D01AFEEB890A

From cc0e5477dd8936c3eb9b9d22ab9117f449aff141 Mon Sep 17 00:00:00 2001
From: colonelborkmundus <colonelborkmundus@gmail.com>
Date: Wed, 18 Jan 2023 15:25:25 -0500
Subject: [PATCH 10/19] added more keys, removed accidental dupes

---
 client/dictionaries/mfc_default_keys.dic | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic
index 3ba6ccc10..235cabe20 100644
--- a/client/dictionaries/mfc_default_keys.dic
+++ b/client/dictionaries/mfc_default_keys.dic
@@ -1916,21 +1916,29 @@ D144BD193063
 # "the more, the marriott" mifare project
 #
 # mifare classic 1k - graduate hotel
-0D258FE90296
-17193709ADF4
 C49DAE1C6049
 209A2B910545
-752FBB5B7B45
 #
 # mifare classic 1k - westin
-B578F38A5C61
 8C29F8320617
 5697519A8F02
+7D0A1C277C05
+2058580A941F
+C40964215509
+D44CFC178460
 #
 # mifare classic 1k EV1 - marriott
-D01AFEEB890A
 7B4DFC6D6525
 23C9FDD9A366
 3119A70628EB
 30AAD6A711EF
-1330824CD356
\ No newline at end of file
+1330824CD356
+#
+# mifare classic 1k - AC hotels marriott
+8EA8EC3F2320
+#
+# mifare classic 1k - the ritz-carlton
+30FB20D0EFEF
+#
+# mifare classic 1k - unknown
+722538817225
\ No newline at end of file

From 6850cacc699c3a3db3215fee4de3b0e4d244fbdf Mon Sep 17 00:00:00 2001
From: Alejandro <45500329+Alejandro12120@users.noreply.github.com>
Date: Sat, 21 Jan 2023 20:28:30 +0100
Subject: [PATCH 11/19] fix typo

Signed-off-by: Alejandro <45500329+Alejandro12120@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d931e1ad5..3edd4e786 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ We define generic Proxmark3 platforms as following devices.
    - **Note**: unknown pin assignments.
  - ⚠  Ryscorp Proxmark3 Pro 
    - **Note**: device has different fpga and unknown pin assignments.
-   - **Note**: Company have dissappared, leaving their customers in the dark.
+   - **Note**: Company have disappeared, leaving their customers in the dark.
  - ⚠  iCopy-X
    - **Note**: experimental support, currently incompatible with iCopy-X GUI as Proxmark client commands are now using cliparser.
    - **Note**: see also [icopyx-community repos](https://github.com/iCopy-X-Community/) for upstream sources, reversed hw etc.

From f05c6a1f72da7765f1cd9d37b25963e33671bb6c Mon Sep 17 00:00:00 2001
From: Self Not Found <wh201906@yandex.com>
Date: Sun, 22 Jan 2023 15:12:33 +0800
Subject: [PATCH 12/19] Fix the types of parameters in BitstreamOut_t

BitstreamOut_t in client/src/loclass/cipherutils.h
is also used in client/src/cmddata.c for decimatioin,
but uint8_t is too small for such application
---
 armsrc/optimized_cipherutils.h   | 8 ++++----
 client/src/loclass/cipherutils.h | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/armsrc/optimized_cipherutils.h b/armsrc/optimized_cipherutils.h
index 73fbfc730..1bef017a2 100644
--- a/armsrc/optimized_cipherutils.h
+++ b/armsrc/optimized_cipherutils.h
@@ -39,14 +39,14 @@
 
 typedef struct {
     uint8_t *buffer;
-    uint8_t numbits;
-    uint8_t position;
+    uint32_t numbits;
+    uint32_t position;
 } BitstreamIn_t;
 
 typedef struct {
     uint8_t *buffer;
-    uint8_t numbits;
-    uint8_t position;
+    uint32_t numbits;
+    uint32_t position;
 } BitstreamOut_t;
 
 bool headBit(BitstreamIn_t *stream);
diff --git a/client/src/loclass/cipherutils.h b/client/src/loclass/cipherutils.h
index aeba9f33d..160945f0d 100644
--- a/client/src/loclass/cipherutils.h
+++ b/client/src/loclass/cipherutils.h
@@ -42,14 +42,14 @@
 
 typedef struct {
     uint8_t *buffer;
-    uint8_t numbits;
-    uint8_t position;
+    uint32_t numbits;
+    uint32_t position;
 } BitstreamIn_t;
 
 typedef struct {
     uint8_t *buffer;
-    uint8_t numbits;
-    uint8_t position;
+    uint32_t numbits;
+    uint32_t position;
 } BitstreamOut_t;
 
 bool headBit(BitstreamIn_t *stream);

From af00fde250c0458de619b6f2d89c475d15b5c18d Mon Sep 17 00:00:00 2001
From: colonelborkmundus <colonelborkmundus@gmail.com>
Date: Sun, 22 Jan 2023 02:36:19 -0500
Subject: [PATCH 13/19] additional 1k keys, fresh from the oven

---
 client/dictionaries/mfc_default_keys.dic | 45 +++++++++++++++++++-----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic
index 235cabe20..651a4d547 100644
--- a/client/dictionaries/mfc_default_keys.dic
+++ b/client/dictionaries/mfc_default_keys.dic
@@ -1911,15 +1911,14 @@ D144BD193063
 453857395635
 #
 ##########################################
-#
 # added by colonelborkmundus
 # "the more, the marriott" mifare project
 #
-# mifare classic 1k - graduate hotel
+# 1k - graduate hotel
 C49DAE1C6049
 209A2B910545
 #
-# mifare classic 1k - westin
+# 1k - westin
 8C29F8320617
 5697519A8F02
 7D0A1C277C05
@@ -1927,18 +1926,48 @@ C49DAE1C6049
 C40964215509
 D44CFC178460
 #
-# mifare classic 1k EV1 - marriott
+# 1k - marriott
 7B4DFC6D6525
 23C9FDD9A366
 3119A70628EB
 30AAD6A711EF
 1330824CD356
+43012BD9EB87
+035C70558D7B
 #
-# mifare classic 1k - AC hotels marriott
+# 1k - AC hotels marriott
 8EA8EC3F2320
 #
-# mifare classic 1k - the ritz-carlton
+# 1k - the ritz-carlton
 30FB20D0EFEF
+D20289CD9E6E
 #
-# mifare classic 1k - unknown
-722538817225
\ No newline at end of file
+# 1k - unknown
+722538817225
+#
+# 1k - aria resort & casino
+316B8FAA12EF
+A18D9F4E75AF
+#
+# 1k - fairfield inn & suites marriott
+7AEB989A5525
+7B3B589A5525
+215E9DED9DDF
+334E91BE3377
+310308EC52EF
+#
+# 1k - residence inn marriott
+F72CD208FDF9
+#
+# 1k - sheraton
+42FC522DE987
+#
+# 1k - millenium hotels
+132F641C948B
+#
+# 1k - moxy hotels
+20C166C00ADB
+9EE3896C4530
+#
+# 1k - residence inn marriott
+3122AE5341EB
\ No newline at end of file

From ec8a603aca072cce920ac92301819d9cabb1eef6 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 22 Jan 2023 17:47:39 +0100
Subject: [PATCH 14/19] text

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97fa48f5d..b4cde2d93 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 tesla info` - intital information command to read TESLA cards (@iceman1001)
  - Changed `hf emrtd info` - looking for lower case .bin extensions (@iceman1001)
  - Changed `hf emrtd dump` - looking for lower case .bin extensions (@iceman1001)
  - Changed `lf paradox clone` - it now accepts FC/CN (@mwalker33)

From ad9771b4c0fd7097267d352902d5a4339e0ec8d4 Mon Sep 17 00:00:00 2001
From: colonelborkmundus <colonelborkmundus@gmail.com>
Date: Sun, 22 Jan 2023 11:57:32 -0500
Subject: [PATCH 15/19] removed modified files from pull request

---
 client/dictionaries/mfc_default_keys.dic |   16 +-
 client/src/cmdhflist.c                   |    2 +-
 client/src/pm3line_vocabulory.h          | 1484 +++++++++++-----------
 3 files changed, 758 insertions(+), 744 deletions(-)

diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic
index 651a4d547..881c72df0 100644
--- a/client/dictionaries/mfc_default_keys.dic
+++ b/client/dictionaries/mfc_default_keys.dic
@@ -1934,13 +1934,18 @@ D44CFC178460
 1330824CD356
 43012BD9EB87
 035C70558D7B
+9966588CB9A0
+12AB4C37BB8B
 #
 # 1k - AC hotels marriott
 8EA8EC3F2320
+7B56B2B38725
 #
 # 1k - the ritz-carlton
 30FB20D0EFEF
 D20289CD9E6E
+66A3B064CC4B
+D18296CD9E6E
 #
 # 1k - unknown
 722538817225
@@ -1970,4 +1975,13 @@ F72CD208FDF9
 9EE3896C4530
 #
 # 1k - residence inn marriott
-3122AE5341EB
\ No newline at end of file
+3122AE5341EB
+#
+# 1k - americinn 
+8AC04C1A4A25
+#
+# 1k - the industrialist
+2158E314C3DF
+#
+# 1k - waldorf astoria
+011C6CF459E8
\ No newline at end of file
diff --git a/client/src/cmdhflist.c b/client/src/cmdhflist.c
index 232d4af19..a19ecdea9 100644
--- a/client/src/cmdhflist.c
+++ b/client/src/cmdhflist.c
@@ -318,7 +318,7 @@ int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool i
                 snprintf(exp, size, "AUTH-B(%d)", cmd[1]);
                 break;
             }
-            case MIFARE_MAGIC_GDM_AUTH_KEYA: {
+            case MIFARE_MAGIC_GDM_AUTH_KEYA:{
                 if (cmdsize > 3) {
                     snprintf(exp, size, "MAGIC AUTH-A(%d)", cmd[1]);
                     MifareAuthState = masNt;
diff --git a/client/src/pm3line_vocabulory.h b/client/src/pm3line_vocabulory.h
index 91a88a1c0..5a517c645 100644
--- a/client/src/pm3line_vocabulory.h
+++ b/client/src/pm3line_vocabulory.h
@@ -31,747 +31,747 @@ typedef struct vocabulory_s {
 } vocabulory_t;
 
 const static vocabulory_t vocabulory[] = {
-    { 1, "help" },
-    { 0, "auto" },
-    { 1, "clear" },
-    { 1, "hints" },
-    { 1, "msleep" },
-    { 1, "rem" },
-    { 1, "quit" },
-    { 1, "exit" },
-    { 1, "prefs help" },
-    { 1, "prefs show" },
-    { 1, "prefs get barmode" },
-    { 1, "prefs get clientdebug" },
-    { 1, "prefs get clientdelay" },
-    { 1, "prefs get color" },
-    { 1, "prefs get savepaths" },
-    { 1, "prefs get emoji" },
-    { 1, "prefs get hints" },
-    { 1, "prefs get output" },
-    { 1, "prefs get plotsliders" },
-    { 1, "prefs set help" },
-    { 1, "prefs set barmode" },
-    { 1, "prefs set clientdebug" },
-    { 1, "prefs set clientdelay" },
-    { 1, "prefs set color" },
-    { 1, "prefs set emoji" },
-    { 1, "prefs set hints" },
-    { 1, "prefs set savepaths" },
-    { 1, "prefs set output" },
-    { 1, "prefs set plotsliders" },
-    { 1, "analyse help" },
-    { 1, "analyse lcr" },
-    { 1, "analyse crc" },
-    { 1, "analyse chksum" },
-    { 1, "analyse dates" },
-    { 1, "analyse lfsr" },
-    { 1, "analyse a" },
-    { 1, "analyse nuid" },
-    { 1, "analyse demodbuff" },
-    { 1, "analyse freq" },
-    { 1, "analyse foo" },
-    { 1, "analyse units" },
-    { 1, "data help" },
-    { 1, "data biphaserawdecode" },
-    { 1, "data detectclock" },
-    { 1, "data fsktonrz" },
-    { 1, "data manrawdecode" },
-    { 1, "data modulation" },
-    { 1, "data rawdemod" },
-    { 1, "data askedgedetect" },
-    { 1, "data autocorr" },
-    { 1, "data dirthreshold" },
-    { 1, "data decimate" },
-    { 1, "data undecimate" },
-    { 1, "data hide" },
-    { 1, "data hpf" },
-    { 1, "data iir" },
-    { 1, "data grid" },
-    { 1, "data ltrim" },
-    { 1, "data mtrim" },
-    { 1, "data norm" },
-    { 1, "data plot" },
-    { 1, "data rtrim" },
-    { 1, "data setgraphmarkers" },
-    { 1, "data shiftgraphzero" },
-    { 1, "data timescale" },
-    { 1, "data zerocrossings" },
-    { 1, "data convertbitstream" },
-    { 1, "data getbitstream" },
-    { 1, "data asn1" },
-    { 1, "data bin2hex" },
-    { 0, "data bitsamples" },
-    { 1, "data clear" },
-    { 1, "data diff" },
-    { 0, "data hexsamples" },
-    { 1, "data hex2bin" },
-    { 1, "data load" },
-    { 1, "data print" },
-    { 0, "data samples" },
-    { 1, "data save" },
-    { 1, "data setdebugmode" },
-    { 0, "data tune" },
-    { 1, "emv help" },
-    { 0, "emv exec" },
-    { 0, "emv pse" },
-    { 0, "emv search" },
-    { 0, "emv select" },
-    { 0, "emv gpo" },
-    { 0, "emv readrec" },
-    { 0, "emv genac" },
-    { 0, "emv challenge" },
-    { 0, "emv intauth" },
-    { 0, "emv scan" },
-    { 1, "emv test" },
-    { 1, "emv list" },
-    { 0, "emv roca" },
-    { 1, "hf help" },
-    { 1, "hf list" },
-    { 0, "hf plot" },
-    { 0, "hf tune" },
-    { 1, "hf search" },
-    { 0, "hf sniff" },
-    { 1, "hf 14a help" },
-    { 1, "hf 14a list" },
-    { 0, "hf 14a antifuzz" },
-    { 0, "hf 14a config" },
-    { 0, "hf 14a cuids" },
-    { 0, "hf 14a info" },
-    { 0, "hf 14a sim" },
-    { 0, "hf 14a sniff" },
-    { 0, "hf 14a raw" },
-    { 0, "hf 14a reader" },
-    { 0, "hf 14a apdu" },
-    { 0, "hf 14a apdufind" },
-    { 0, "hf 14a chaining" },
-    { 0, "hf 14a ndefformat" },
-    { 0, "hf 14a ndefread" },
-    { 0, "hf 14a ndefwrite" },
-    { 1, "hf 14b help" },
-    { 0, "hf 14b apdu" },
-    { 0, "hf 14b dump" },
-    { 0, "hf 14b info" },
-    { 1, "hf 14b list" },
-    { 0, "hf 14b ndefread" },
-    { 0, "hf 14b raw" },
-    { 0, "hf 14b reader" },
-    { 0, "hf 14b sim" },
-    { 0, "hf 14b sniff" },
-    { 0, "hf 14b rdbl" },
-    { 0, "hf 14b sriwrite" },
-    { 1, "hf 14b view" },
-    { 1, "hf 15 help" },
-    { 1, "hf 15 list" },
-    { 1, "hf 15 demod" },
-    { 0, "hf 15 dump" },
-    { 0, "hf 15 info" },
-    { 0, "hf 15 sniff" },
-    { 0, "hf 15 raw" },
-    { 0, "hf 15 rdbl" },
-    { 0, "hf 15 rdmulti" },
-    { 0, "hf 15 reader" },
-    { 0, "hf 15 restore" },
-    { 0, "hf 15 samples" },
-    { 0, "hf 15 eload" },
-    { 0, "hf 15 esave" },
-    { 0, "hf 15 eview" },
-    { 0, "hf 15 sim" },
-    { 0, "hf 15 slixdisable" },
-    { 0, "hf 15 wrbl" },
-    { 0, "hf 15 findafi" },
-    { 0, "hf 15 writeafi" },
-    { 0, "hf 15 writedsfid" },
-    { 0, "hf 15 csetuid" },
-    { 1, "hf cipurse help" },
-    { 0, "hf cipurse info" },
-    { 0, "hf cipurse select" },
-    { 0, "hf cipurse auth" },
-    { 0, "hf cipurse read" },
-    { 0, "hf cipurse write" },
-    { 0, "hf cipurse aread" },
-    { 0, "hf cipurse awrite" },
-    { 0, "hf cipurse formatall" },
-    { 0, "hf cipurse create" },
-    { 0, "hf cipurse delete" },
-    { 0, "hf cipurse updkey" },
-    { 0, "hf cipurse updakey" },
-    { 0, "hf cipurse default" },
-    { 1, "hf cipurse test" },
-    { 1, "hf epa help" },
-    { 0, "hf epa cnonces" },
-    { 0, "hf epa replay" },
-    { 0, "hf epa sim" },
-    { 1, "hf emrtd help" },
-    { 0, "hf emrtd dump" },
-    { 1, "hf emrtd info" },
-    { 1, "hf emrtd list" },
-    { 1, "hf felica help" },
-    { 1, "hf felica list" },
-    { 0, "hf felica reader" },
-    { 0, "hf felica info" },
-    { 0, "hf felica sniff" },
-    { 0, "hf felica raw" },
-    { 0, "hf felica rdbl" },
-    { 0, "hf felica wrbl" },
-    { 0, "hf felica rqservice" },
-    { 0, "hf felica rqresponse" },
-    { 0, "hf felica scsvcode" },
-    { 0, "hf felica rqsyscode" },
-    { 0, "hf felica auth1" },
-    { 0, "hf felica auth2" },
-    { 0, "hf felica rqspecver" },
-    { 0, "hf felica resetmode" },
-    { 0, "hf felica litesim" },
-    { 0, "hf felica litedump" },
-    { 1, "hf fido help" },
-    { 1, "hf fido list" },
-    { 0, "hf fido info" },
-    { 0, "hf fido reg" },
-    { 0, "hf fido auth" },
-    { 0, "hf fido make" },
-    { 0, "hf fido assert" },
-    { 1, "hf fudan help" },
-    { 0, "hf fudan reader" },
-    { 0, "hf fudan dump" },
-    { 0, "hf fudan rdbl" },
-    { 1, "hf fudan view" },
-    { 0, "hf fudan wrbl" },
-    { 1, "hf gallagher help" },
-    { 0, "hf gallagher reader" },
-    { 0, "hf gallagher clone" },
-    { 0, "hf gallagher delete" },
-    { 1, "hf gallagher diversifykey" },
-    { 1, "hf gallagher decode" },
-    { 1, "hf ksx6924 help" },
-    { 0, "hf ksx6924 select" },
-    { 0, "hf ksx6924 info" },
-    { 0, "hf ksx6924 balance" },
-    { 0, "hf ksx6924 init" },
-    { 0, "hf ksx6924 prec" },
-    { 1, "hf jooki help" },
-    { 0, "hf jooki clone" },
-    { 1, "hf jooki decode" },
-    { 1, "hf jooki encode" },
-    { 0, "hf jooki sim" },
-    { 1, "hf iclass help" },
-    { 0, "hf iclass dump" },
-    { 1, "hf iclass info" },
-    { 1, "hf iclass list" },
-    { 0, "hf iclass rdbl" },
-    { 0, "hf iclass reader" },
-    { 0, "hf iclass restore" },
-    { 0, "hf iclass sniff" },
-    { 0, "hf iclass wrbl" },
-    { 0, "hf iclass chk" },
-    { 1, "hf iclass loclass" },
-    { 1, "hf iclass lookup" },
-    { 0, "hf iclass sim" },
-    { 0, "hf iclass eload" },
-    { 0, "hf iclass esave" },
-    { 0, "hf iclass eview" },
-    { 1, "hf iclass configcard" },
-    { 1, "hf iclass calcnewkey" },
-    { 1, "hf iclass encode" },
-    { 1, "hf iclass encrypt" },
-    { 1, "hf iclass decrypt" },
-    { 1, "hf iclass managekeys" },
-    { 1, "hf iclass permutekey" },
-    { 1, "hf iclass view" },
-    { 1, "hf legic help" },
-    { 0, "hf legic dump" },
-    { 0, "hf legic info" },
-    { 1, "hf legic list" },
-    { 0, "hf legic rdbl" },
-    { 0, "hf legic reader" },
-    { 0, "hf legic restore" },
-    { 0, "hf legic wipe" },
-    { 0, "hf legic wrbl" },
-    { 0, "hf legic sim" },
-    { 0, "hf legic eload" },
-    { 0, "hf legic esave" },
-    { 0, "hf legic eview" },
-    { 1, "hf legic crc" },
-    { 1, "hf legic view" },
-    { 1, "hf lto help" },
-    { 0, "hf lto dump" },
-    { 0, "hf lto info" },
-    { 1, "hf lto list" },
-    { 0, "hf lto rdbl" },
-    { 0, "hf lto reader" },
-    { 0, "hf lto restore" },
-    { 0, "hf lto wrbl" },
-    { 1, "hf mf help" },
-    { 1, "hf mf list" },
-    { 0, "hf mf darkside" },
-    { 0, "hf mf nested" },
-    { 1, "hf mf hardnested" },
-    { 0, "hf mf staticnested" },
-    { 0, "hf mf autopwn" },
-    { 0, "hf mf nack" },
-    { 0, "hf mf chk" },
-    { 0, "hf mf fchk" },
-    { 1, "hf mf decrypt" },
-    { 0, "hf mf supercard" },
-    { 0, "hf mf auth4" },
-    { 1, "hf mf acl" },
-    { 0, "hf mf dump" },
-    { 1, "hf mf mad" },
-    { 0, "hf mf personalize" },
-    { 0, "hf mf rdbl" },
-    { 0, "hf mf rdsc" },
-    { 0, "hf mf restore" },
-    { 0, "hf mf setmod" },
-    { 1, "hf mf value" },
-    { 1, "hf mf view" },
-    { 0, "hf mf wipe" },
-    { 0, "hf mf wrbl" },
-    { 0, "hf mf sim" },
-    { 0, "hf mf ecfill" },
-    { 0, "hf mf eclr" },
-    { 0, "hf mf egetblk" },
-    { 0, "hf mf egetsc" },
-    { 0, "hf mf ekeyprn" },
-    { 0, "hf mf eload" },
-    { 0, "hf mf esave" },
-    { 0, "hf mf esetblk" },
-    { 0, "hf mf eview" },
-    { 0, "hf mf cgetblk" },
-    { 0, "hf mf cgetsc" },
-    { 0, "hf mf cload" },
-    { 0, "hf mf csave" },
-    { 0, "hf mf csetblk" },
-    { 0, "hf mf csetuid" },
-    { 0, "hf mf cview" },
-    { 0, "hf mf cwipe" },
-    { 0, "hf mf gen3uid" },
-    { 0, "hf mf gen3blk" },
-    { 0, "hf mf gen3freeze" },
-    { 0, "hf mf ggetblk" },
-    { 0, "hf mf gload" },
-    { 0, "hf mf gsave" },
-    { 0, "hf mf gsetblk" },
-    { 0, "hf mf gview" },
-    { 0, "hf mf ndefformat" },
-    { 0, "hf mf ndefread" },
-    { 0, "hf mf ndefwrite" },
-    { 1, "hf mfp help" },
-    { 0, "hf mfp info" },
-    { 0, "hf mfp wrp" },
-    { 0, "hf mfp initp" },
-    { 0, "hf mfp commitp" },
-    { 0, "hf mfp auth" },
-    { 0, "hf mfp rdbl" },
-    { 0, "hf mfp rdsc" },
-    { 0, "hf mfp wrbl" },
-    { 0, "hf mfp chk" },
-    { 0, "hf mfp mad" },
-    { 0, "hf mfp ndefread" },
-    { 1, "hf mfu help" },
-    { 1, "hf mfu keygen" },
-    { 1, "hf mfu pwdgen" },
-    { 0, "hf mfu otptear" },
-    { 0, "hf mfu cauth" },
-    { 0, "hf mfu dump" },
-    { 0, "hf mfu info" },
-    { 0, "hf mfu ndefread" },
-    { 0, "hf mfu rdbl" },
-    { 0, "hf mfu restore" },
-    { 1, "hf mfu view" },
-    { 0, "hf mfu wrbl" },
-    { 0, "hf mfu eload" },
-    { 0, "hf mfu esave" },
-    { 0, "hf mfu eview" },
-    { 0, "hf mfu sim" },
-    { 0, "hf mfu setpwd" },
-    { 0, "hf mfu setuid" },
-    { 1, "hf mfdes help" },
-    { 0, "hf mfdes info" },
-    { 0, "hf mfdes getuid" },
-    { 0, "hf mfdes default" },
-    { 0, "hf mfdes auth" },
-    { 0, "hf mfdes chk" },
-    { 0, "hf mfdes detect" },
-    { 0, "hf mfdes freemem" },
-    { 0, "hf mfdes setconfig" },
-    { 0, "hf mfdes formatpicc" },
-    { 1, "hf mfdes list" },
-    { 0, "hf mfdes mad" },
-    { 0, "hf mfdes lsapp" },
-    { 0, "hf mfdes getaids" },
-    { 0, "hf mfdes getappnames" },
-    { 0, "hf mfdes bruteaid" },
-    { 0, "hf mfdes createapp" },
-    { 0, "hf mfdes deleteapp" },
-    { 0, "hf mfdes selectapp" },
-    { 0, "hf mfdes changekey" },
-    { 0, "hf mfdes chkeysettings" },
-    { 0, "hf mfdes getkeysettings" },
-    { 0, "hf mfdes getkeyversions" },
-    { 0, "hf mfdes getfileids" },
-    { 0, "hf mfdes getfileisoids" },
-    { 0, "hf mfdes lsfiles" },
-    { 0, "hf mfdes dump" },
-    { 0, "hf mfdes createfile" },
-    { 0, "hf mfdes createvaluefile" },
-    { 0, "hf mfdes createrecordfile" },
-    { 0, "hf mfdes createmacfile" },
-    { 0, "hf mfdes deletefile" },
-    { 0, "hf mfdes getfilesettings" },
-    { 0, "hf mfdes chfilesettings" },
-    { 0, "hf mfdes read" },
-    { 0, "hf mfdes write" },
-    { 0, "hf mfdes value" },
-    { 0, "hf mfdes clearrecfile" },
-    { 1, "hf mfdes test" },
-    { 1, "hf ntag424 help" },
-    { 0, "hf ntag424 info" },
-    { 0, "hf ntag424 sdm" },
-    { 1, "hf ntag424 view" },
-    { 1, "hf seos help" },
-    { 0, "hf seos info" },
-    { 1, "hf seos list" },
-    { 1, "hf st25ta help" },
-    { 0, "hf st25ta info" },
-    { 1, "hf st25ta list" },
-    { 1, "hf st25ta ndefread" },
-    { 0, "hf st25ta protect" },
-    { 0, "hf st25ta pwd" },
-    { 0, "hf st25ta sim" },
-    { 1, "hf thinfilm help" },
-    { 0, "hf thinfilm info" },
-    { 1, "hf thinfilm list" },
-    { 0, "hf thinfilm sim" },
-    { 1, "hf topaz help" },
-    { 0, "hf topaz dump" },
-    { 1, "hf topaz list" },
-    { 0, "hf topaz info" },
-    { 0, "hf topaz reader" },
-    { 0, "hf topaz sim" },
-    { 0, "hf topaz sniff" },
-    { 0, "hf topaz raw" },
-    { 0, "hf topaz rdbl" },
-    { 1, "hf topaz view" },
-    { 0, "hf topaz wrbl" },
-    { 1, "hf texkom help" },
-    { 0, "hf texkom reader" },
-    { 0, "hf texkom sim" },
-    { 1, "hf xerox help" },
-    { 0, "hf xerox info" },
-    { 0, "hf xerox reader" },
-    { 0, "hf xerox dump" },
-    { 1, "hf waveshare help" },
-    { 0, "hf waveshare loadbmp" },
-    { 1, "hw help" },
-    { 0, "hw break" },
-    { 1, "hw connect" },
-    { 0, "hw dbg" },
-    { 0, "hw detectreader" },
-    { 0, "hw fpgaoff" },
-    { 0, "hw lcd" },
-    { 0, "hw lcdreset" },
-    { 0, "hw ping" },
-    { 0, "hw readmem" },
-    { 0, "hw reset" },
-    { 0, "hw setlfdivisor" },
-    { 0, "hw setmux" },
-    { 0, "hw standalone" },
-    { 0, "hw status" },
-    { 0, "hw tearoff" },
-    { 0, "hw tia" },
-    { 0, "hw tune" },
-    { 1, "hw version" },
-    { 1, "lf help" },
-    { 0, "lf config" },
-    { 0, "lf cmdread" },
-    { 0, "lf read" },
-    { 1, "lf search" },
-    { 0, "lf sim" },
-    { 0, "lf simask" },
-    { 0, "lf simfsk" },
-    { 0, "lf simpsk" },
-    { 0, "lf simbidir" },
-    { 0, "lf sniff" },
-    { 0, "lf tune" },
-    { 1, "lf awid help" },
-    { 1, "lf awid demod" },
-    { 0, "lf awid reader" },
-    { 0, "lf awid clone" },
-    { 0, "lf awid sim" },
-    { 0, "lf awid brute" },
-    { 0, "lf awid watch" },
-    { 1, "lf cotag help" },
-    { 1, "lf cotag demod" },
-    { 0, "lf cotag reader" },
-    { 1, "lf destron help" },
-    { 1, "lf destron demod" },
-    { 0, "lf destron reader" },
-    { 0, "lf destron clone" },
-    { 0, "lf destron sim" },
-    { 1, "lf em help" },
-    { 1, "lf em 410x help" },
-    { 1, "lf em 410x demod" },
-    { 0, "lf em 410x reader" },
-    { 0, "lf em 410x sim" },
-    { 0, "lf em 410x brute" },
-    { 0, "lf em 410x watch" },
-    { 0, "lf em 410x spoof" },
-    { 0, "lf em 410x clone" },
-    { 1, "lf em 4x05 help" },
-    { 0, "lf em 4x05 brute" },
-    { 0, "lf em 4x05 chk" },
-    { 1, "lf em 4x05 demod" },
-    { 0, "lf em 4x05 dump" },
-    { 0, "lf em 4x05 info" },
-    { 0, "lf em 4x05 read" },
-    { 1, "lf em 4x05 sniff" },
-    { 0, "lf em 4x05 unlock" },
-    { 0, "lf em 4x05 wipe" },
-    { 0, "lf em 4x05 write" },
-    { 1, "lf em 4x50 help" },
-    { 0, "lf em 4x50 brute" },
-    { 0, "lf em 4x50 chk" },
-    { 0, "lf em 4x50 dump" },
-    { 0, "lf em 4x50 info" },
-    { 0, "lf em 4x50 login" },
-    { 0, "lf em 4x50 rdbl" },
-    { 0, "lf em 4x50 reader" },
-    { 0, "lf em 4x50 restore" },
-    { 0, "lf em 4x50 wrbl" },
-    { 0, "lf em 4x50 wrpwd" },
-    { 0, "lf em 4x50 wipe" },
-    { 0, "lf em 4x50 eload" },
-    { 0, "lf em 4x50 esave" },
-    { 0, "lf em 4x50 eview" },
-    { 0, "lf em 4x50 sim" },
-    { 1, "lf em 4x70 help" },
-    { 0, "lf em 4x70 info" },
-    { 0, "lf em 4x70 write" },
-    { 0, "lf em 4x70 unlock" },
-    { 0, "lf em 4x70 auth" },
-    { 0, "lf em 4x70 writepin" },
-    { 0, "lf em 4x70 writekey" },
-    { 1, "lf fdxb help" },
-    { 1, "lf fdxb demod" },
-    { 0, "lf fdxb reader" },
-    { 0, "lf fdxb clone" },
-    { 0, "lf fdxb sim" },
-    { 1, "lf gallagher help" },
-    { 1, "lf gallagher demod" },
-    { 0, "lf gallagher reader" },
-    { 0, "lf gallagher clone" },
-    { 0, "lf gallagher sim" },
-    { 1, "lf gproxii help" },
-    { 1, "lf gproxii demod" },
-    { 0, "lf gproxii reader" },
-    { 0, "lf gproxii clone" },
-    { 0, "lf gproxii sim" },
-    { 1, "lf hid help" },
-    { 1, "lf hid demod" },
-    { 0, "lf hid reader" },
-    { 0, "lf hid clone" },
-    { 0, "lf hid sim" },
-    { 0, "lf hid brute" },
-    { 0, "lf hid watch" },
-    { 1, "lf hitag help" },
-    { 0, "lf hitag eload" },
-    { 1, "lf hitag list" },
-    { 0, "lf hitag info" },
-    { 0, "lf hitag reader" },
-    { 0, "lf hitag sim" },
-    { 0, "lf hitag sniff" },
-    { 0, "lf hitag writer" },
-    { 0, "lf hitag dump" },
-    { 0, "lf hitag cc" },
-    { 1, "lf idteck help" },
-    { 1, "lf idteck demod" },
-    { 0, "lf idteck reader" },
-    { 0, "lf idteck clone" },
-    { 0, "lf idteck sim" },
-    { 1, "lf indala help" },
-    { 0, "lf indala brute" },
-    { 1, "lf indala demod" },
-    { 1, "lf indala altdemod" },
-    { 0, "lf indala reader" },
-    { 0, "lf indala clone" },
-    { 0, "lf indala sim" },
-    { 1, "lf io help" },
-    { 1, "lf io demod" },
-    { 0, "lf io reader" },
-    { 0, "lf io clone" },
-    { 0, "lf io sim" },
-    { 0, "lf io watch" },
-    { 1, "lf jablotron help" },
-    { 1, "lf jablotron demod" },
-    { 0, "lf jablotron reader" },
-    { 0, "lf jablotron clone" },
-    { 0, "lf jablotron sim" },
-    { 1, "lf keri help" },
-    { 1, "lf keri demod" },
-    { 0, "lf keri reader" },
-    { 0, "lf keri clone" },
-    { 0, "lf keri sim" },
-    { 1, "lf motorola help" },
-    { 1, "lf motorola demod" },
-    { 0, "lf motorola reader" },
-    { 0, "lf motorola clone" },
-    { 0, "lf motorola sim" },
-    { 1, "lf nedap help" },
-    { 1, "lf nedap demod" },
-    { 0, "lf nedap reader" },
-    { 0, "lf nedap clone" },
-    { 0, "lf nedap sim" },
-    { 1, "lf nexwatch help" },
-    { 1, "lf nexwatch demod" },
-    { 0, "lf nexwatch reader" },
-    { 0, "lf nexwatch clone" },
-    { 0, "lf nexwatch sim" },
-    { 1, "lf noralsy help" },
-    { 1, "lf noralsy demod" },
-    { 0, "lf noralsy reader" },
-    { 0, "lf noralsy clone" },
-    { 0, "lf noralsy sim" },
-    { 1, "lf pac help" },
-    { 1, "lf pac demod" },
-    { 0, "lf pac reader" },
-    { 0, "lf pac clone" },
-    { 0, "lf pac sim" },
-    { 1, "lf paradox help" },
-    { 1, "lf paradox demod" },
-    { 0, "lf paradox reader" },
-    { 0, "lf paradox clone" },
-    { 0, "lf paradox sim" },
-    { 1, "lf pcf7931 help" },
-    { 0, "lf pcf7931 reader" },
-    { 0, "lf pcf7931 write" },
-    { 1, "lf pcf7931 config" },
-    { 1, "lf presco help" },
-    { 1, "lf presco demod" },
-    { 0, "lf presco reader" },
-    { 0, "lf presco clone" },
-    { 0, "lf presco sim" },
-    { 1, "lf pyramid help" },
-    { 1, "lf pyramid demod" },
-    { 0, "lf pyramid reader" },
-    { 0, "lf pyramid clone" },
-    { 0, "lf pyramid sim" },
-    { 1, "lf securakey help" },
-    { 1, "lf securakey demod" },
-    { 0, "lf securakey reader" },
-    { 0, "lf securakey clone" },
-    { 0, "lf securakey sim" },
-    { 1, "lf ti help" },
-    { 1, "lf ti demod" },
-    { 0, "lf ti reader" },
-    { 0, "lf ti write" },
-    { 1, "lf t55xx help" },
-    { 0, "lf t55xx clonehelp" },
-    { 1, "lf t55xx config" },
-    { 0, "lf t55xx dangerraw" },
-    { 1, "lf t55xx detect" },
-    { 0, "lf t55xx deviceconfig" },
-    { 0, "lf t55xx dump" },
-    { 1, "lf t55xx info" },
-    { 0, "lf t55xx p1detect" },
-    { 0, "lf t55xx read" },
-    { 0, "lf t55xx resetread" },
-    { 0, "lf t55xx restore" },
-    { 1, "lf t55xx trace" },
-    { 0, "lf t55xx wakeup" },
-    { 0, "lf t55xx write" },
-    { 0, "lf t55xx bruteforce" },
-    { 0, "lf t55xx chk" },
-    { 0, "lf t55xx protect" },
-    { 0, "lf t55xx recoverpw" },
-    { 1, "lf t55xx sniff" },
-    { 0, "lf t55xx special" },
-    { 0, "lf t55xx wipe" },
-    { 1, "lf viking help" },
-    { 1, "lf viking demod" },
-    { 0, "lf viking reader" },
-    { 0, "lf viking clone" },
-    { 0, "lf viking sim" },
-    { 1, "lf visa2000 help" },
-    { 1, "lf visa2000 demod" },
-    { 0, "lf visa2000 reader" },
-    { 0, "lf visa2000 clone" },
-    { 0, "lf visa2000 sim" },
-    { 1, "mem help" },
-    { 0, "mem baudrate" },
-    { 0, "mem dump" },
-    { 0, "mem info" },
-    { 0, "mem load" },
-    { 0, "mem wipe" },
-    { 1, "mem spiffs help" },
-    { 0, "mem spiffs copy" },
-    { 0, "mem spiffs check" },
-    { 0, "mem spiffs dump" },
-    { 0, "mem spiffs info" },
-    { 0, "mem spiffs mount" },
-    { 0, "mem spiffs remove" },
-    { 0, "mem spiffs rename" },
-    { 0, "mem spiffs test" },
-    { 0, "mem spiffs tree" },
-    { 0, "mem spiffs unmount" },
-    { 0, "mem spiffs upload" },
-    { 0, "mem spiffs view" },
-    { 0, "mem spiffs wipe" },
-    { 1, "nfc help" },
-    { 1, "nfc decode" },
-    { 0, "nfc type1 read" },
-    { 1, "nfc type1 help" },
-    { 0, "nfc type2 read" },
-    { 1, "nfc type2 help" },
-    { 0, "nfc type4a format" },
-    { 0, "nfc type4a read" },
-    { 0, "nfc type4a write" },
-    { 0, "nfc type4a st25taread" },
-    { 1, "nfc type4a help" },
-    { 0, "nfc type4b read" },
-    { 1, "nfc type4b help" },
-    { 0, "nfc mf cformat" },
-    { 0, "nfc mf cread" },
-    { 0, "nfc mf cwrite" },
-    { 0, "nfc mf pread" },
-    { 1, "nfc mf help" },
-    { 0, "nfc barcode read" },
-    { 0, "nfc barcode sim" },
-    { 1, "nfc barcode help" },
-    { 1, "piv help" },
-    { 0, "piv select" },
-    { 0, "piv getdata" },
-    { 0, "piv authsign" },
-    { 0, "piv scan" },
-    { 1, "piv list" },
-    { 1, "smart help" },
-    { 1, "smart list" },
-    { 0, "smart info" },
-    { 0, "smart reader" },
-    { 0, "smart raw" },
-    { 1, "smart upgrade" },
-    { 0, "smart setclock" },
-    { 0, "smart brute" },
-    { 1, "script help" },
-    { 1, "script list" },
-    { 1, "script run" },
-    { 1, "trace help" },
-    { 1, "trace extract" },
-    { 1, "trace list" },
-    { 1, "trace load" },
-    { 1, "trace save" },
-    { 1, "usart help" },
-    { 0, "usart btpin" },
-    { 0, "usart btfactory" },
-    { 0, "usart tx" },
-    { 0, "usart rx" },
-    { 0, "usart txrx" },
-    { 0, "usart txhex" },
-    { 0, "usart rxhex" },
-    { 0, "usart config" },
-    { 1, "wiegand help" },
-    { 1, "wiegand list" },
-    { 1, "wiegand encode" },
-    { 1, "wiegand decode" },
+    { 1, "help" }, 
+    { 0, "auto" }, 
+    { 1, "clear" }, 
+    { 1, "hints" }, 
+    { 1, "msleep" }, 
+    { 1, "rem" }, 
+    { 1, "quit" }, 
+    { 1, "exit" }, 
+    { 1, "prefs help" }, 
+    { 1, "prefs show" }, 
+    { 1, "prefs get barmode" }, 
+    { 1, "prefs get clientdebug" }, 
+    { 1, "prefs get clientdelay" }, 
+    { 1, "prefs get color" }, 
+    { 1, "prefs get savepaths" }, 
+    { 1, "prefs get emoji" }, 
+    { 1, "prefs get hints" }, 
+    { 1, "prefs get output" }, 
+    { 1, "prefs get plotsliders" }, 
+    { 1, "prefs set help" }, 
+    { 1, "prefs set barmode" }, 
+    { 1, "prefs set clientdebug" }, 
+    { 1, "prefs set clientdelay" }, 
+    { 1, "prefs set color" }, 
+    { 1, "prefs set emoji" }, 
+    { 1, "prefs set hints" }, 
+    { 1, "prefs set savepaths" }, 
+    { 1, "prefs set output" }, 
+    { 1, "prefs set plotsliders" }, 
+    { 1, "analyse help" }, 
+    { 1, "analyse lcr" }, 
+    { 1, "analyse crc" }, 
+    { 1, "analyse chksum" }, 
+    { 1, "analyse dates" }, 
+    { 1, "analyse lfsr" }, 
+    { 1, "analyse a" }, 
+    { 1, "analyse nuid" }, 
+    { 1, "analyse demodbuff" }, 
+    { 1, "analyse freq" }, 
+    { 1, "analyse foo" }, 
+    { 1, "analyse units" }, 
+    { 1, "data help" }, 
+    { 1, "data biphaserawdecode" }, 
+    { 1, "data detectclock" }, 
+    { 1, "data fsktonrz" }, 
+    { 1, "data manrawdecode" }, 
+    { 1, "data modulation" }, 
+    { 1, "data rawdemod" }, 
+    { 1, "data askedgedetect" }, 
+    { 1, "data autocorr" }, 
+    { 1, "data dirthreshold" }, 
+    { 1, "data decimate" }, 
+    { 1, "data undecimate" }, 
+    { 1, "data hide" }, 
+    { 1, "data hpf" }, 
+    { 1, "data iir" }, 
+    { 1, "data grid" }, 
+    { 1, "data ltrim" }, 
+    { 1, "data mtrim" }, 
+    { 1, "data norm" }, 
+    { 1, "data plot" }, 
+    { 1, "data rtrim" }, 
+    { 1, "data setgraphmarkers" }, 
+    { 1, "data shiftgraphzero" }, 
+    { 1, "data timescale" }, 
+    { 1, "data zerocrossings" }, 
+    { 1, "data convertbitstream" }, 
+    { 1, "data getbitstream" }, 
+    { 1, "data asn1" }, 
+    { 1, "data bin2hex" }, 
+    { 0, "data bitsamples" }, 
+    { 1, "data clear" }, 
+    { 1, "data diff" }, 
+    { 0, "data hexsamples" }, 
+    { 1, "data hex2bin" }, 
+    { 1, "data load" }, 
+    { 1, "data print" }, 
+    { 0, "data samples" }, 
+    { 1, "data save" }, 
+    { 1, "data setdebugmode" }, 
+    { 0, "data tune" }, 
+    { 1, "emv help" }, 
+    { 0, "emv exec" }, 
+    { 0, "emv pse" }, 
+    { 0, "emv search" }, 
+    { 0, "emv select" }, 
+    { 0, "emv gpo" }, 
+    { 0, "emv readrec" }, 
+    { 0, "emv genac" }, 
+    { 0, "emv challenge" }, 
+    { 0, "emv intauth" }, 
+    { 0, "emv scan" }, 
+    { 1, "emv test" }, 
+    { 1, "emv list" }, 
+    { 0, "emv roca" }, 
+    { 1, "hf help" }, 
+    { 1, "hf list" }, 
+    { 0, "hf plot" }, 
+    { 0, "hf tune" }, 
+    { 1, "hf search" }, 
+    { 0, "hf sniff" }, 
+    { 1, "hf 14a help" }, 
+    { 1, "hf 14a list" }, 
+    { 0, "hf 14a antifuzz" }, 
+    { 0, "hf 14a config" }, 
+    { 0, "hf 14a cuids" }, 
+    { 0, "hf 14a info" }, 
+    { 0, "hf 14a sim" }, 
+    { 0, "hf 14a sniff" }, 
+    { 0, "hf 14a raw" }, 
+    { 0, "hf 14a reader" }, 
+    { 0, "hf 14a apdu" }, 
+    { 0, "hf 14a apdufind" }, 
+    { 0, "hf 14a chaining" }, 
+    { 0, "hf 14a ndefformat" }, 
+    { 0, "hf 14a ndefread" }, 
+    { 0, "hf 14a ndefwrite" }, 
+    { 1, "hf 14b help" }, 
+    { 0, "hf 14b apdu" }, 
+    { 0, "hf 14b dump" }, 
+    { 0, "hf 14b info" }, 
+    { 1, "hf 14b list" }, 
+    { 0, "hf 14b ndefread" }, 
+    { 0, "hf 14b raw" }, 
+    { 0, "hf 14b reader" }, 
+    { 0, "hf 14b sim" }, 
+    { 0, "hf 14b sniff" }, 
+    { 0, "hf 14b rdbl" }, 
+    { 0, "hf 14b sriwrite" }, 
+    { 1, "hf 14b view" }, 
+    { 1, "hf 15 help" }, 
+    { 1, "hf 15 list" }, 
+    { 1, "hf 15 demod" }, 
+    { 0, "hf 15 dump" }, 
+    { 0, "hf 15 info" }, 
+    { 0, "hf 15 sniff" }, 
+    { 0, "hf 15 raw" }, 
+    { 0, "hf 15 rdbl" }, 
+    { 0, "hf 15 rdmulti" }, 
+    { 0, "hf 15 reader" }, 
+    { 0, "hf 15 restore" }, 
+    { 0, "hf 15 samples" }, 
+    { 0, "hf 15 eload" }, 
+    { 0, "hf 15 esave" }, 
+    { 0, "hf 15 eview" }, 
+    { 0, "hf 15 sim" }, 
+    { 0, "hf 15 slixdisable" }, 
+    { 0, "hf 15 wrbl" }, 
+    { 0, "hf 15 findafi" }, 
+    { 0, "hf 15 writeafi" }, 
+    { 0, "hf 15 writedsfid" }, 
+    { 0, "hf 15 csetuid" }, 
+    { 1, "hf cipurse help" }, 
+    { 0, "hf cipurse info" }, 
+    { 0, "hf cipurse select" }, 
+    { 0, "hf cipurse auth" }, 
+    { 0, "hf cipurse read" }, 
+    { 0, "hf cipurse write" }, 
+    { 0, "hf cipurse aread" }, 
+    { 0, "hf cipurse awrite" }, 
+    { 0, "hf cipurse formatall" }, 
+    { 0, "hf cipurse create" }, 
+    { 0, "hf cipurse delete" }, 
+    { 0, "hf cipurse updkey" }, 
+    { 0, "hf cipurse updakey" }, 
+    { 0, "hf cipurse default" }, 
+    { 1, "hf cipurse test" }, 
+    { 1, "hf epa help" }, 
+    { 0, "hf epa cnonces" }, 
+    { 0, "hf epa replay" }, 
+    { 0, "hf epa sim" }, 
+    { 1, "hf emrtd help" }, 
+    { 0, "hf emrtd dump" }, 
+    { 1, "hf emrtd info" }, 
+    { 1, "hf emrtd list" }, 
+    { 1, "hf felica help" }, 
+    { 1, "hf felica list" }, 
+    { 0, "hf felica reader" }, 
+    { 0, "hf felica info" }, 
+    { 0, "hf felica sniff" }, 
+    { 0, "hf felica raw" }, 
+    { 0, "hf felica rdbl" }, 
+    { 0, "hf felica wrbl" }, 
+    { 0, "hf felica rqservice" }, 
+    { 0, "hf felica rqresponse" }, 
+    { 0, "hf felica scsvcode" }, 
+    { 0, "hf felica rqsyscode" }, 
+    { 0, "hf felica auth1" }, 
+    { 0, "hf felica auth2" }, 
+    { 0, "hf felica rqspecver" }, 
+    { 0, "hf felica resetmode" }, 
+    { 0, "hf felica litesim" }, 
+    { 0, "hf felica litedump" }, 
+    { 1, "hf fido help" }, 
+    { 1, "hf fido list" }, 
+    { 0, "hf fido info" }, 
+    { 0, "hf fido reg" }, 
+    { 0, "hf fido auth" }, 
+    { 0, "hf fido make" }, 
+    { 0, "hf fido assert" }, 
+    { 1, "hf fudan help" }, 
+    { 0, "hf fudan reader" }, 
+    { 0, "hf fudan dump" }, 
+    { 0, "hf fudan rdbl" }, 
+    { 1, "hf fudan view" }, 
+    { 0, "hf fudan wrbl" }, 
+    { 1, "hf gallagher help" }, 
+    { 0, "hf gallagher reader" }, 
+    { 0, "hf gallagher clone" }, 
+    { 0, "hf gallagher delete" }, 
+    { 1, "hf gallagher diversifykey" }, 
+    { 1, "hf gallagher decode" }, 
+    { 1, "hf ksx6924 help" }, 
+    { 0, "hf ksx6924 select" }, 
+    { 0, "hf ksx6924 info" }, 
+    { 0, "hf ksx6924 balance" }, 
+    { 0, "hf ksx6924 init" }, 
+    { 0, "hf ksx6924 prec" }, 
+    { 1, "hf jooki help" }, 
+    { 0, "hf jooki clone" }, 
+    { 1, "hf jooki decode" }, 
+    { 1, "hf jooki encode" }, 
+    { 0, "hf jooki sim" }, 
+    { 1, "hf iclass help" }, 
+    { 0, "hf iclass dump" }, 
+    { 1, "hf iclass info" }, 
+    { 1, "hf iclass list" }, 
+    { 0, "hf iclass rdbl" }, 
+    { 0, "hf iclass reader" }, 
+    { 0, "hf iclass restore" }, 
+    { 0, "hf iclass sniff" }, 
+    { 0, "hf iclass wrbl" }, 
+    { 0, "hf iclass chk" }, 
+    { 1, "hf iclass loclass" }, 
+    { 1, "hf iclass lookup" }, 
+    { 0, "hf iclass sim" }, 
+    { 0, "hf iclass eload" }, 
+    { 0, "hf iclass esave" }, 
+    { 0, "hf iclass eview" }, 
+    { 1, "hf iclass configcard" }, 
+    { 1, "hf iclass calcnewkey" }, 
+    { 1, "hf iclass encode" }, 
+    { 1, "hf iclass encrypt" }, 
+    { 1, "hf iclass decrypt" }, 
+    { 1, "hf iclass managekeys" }, 
+    { 1, "hf iclass permutekey" }, 
+    { 1, "hf iclass view" }, 
+    { 1, "hf legic help" }, 
+    { 0, "hf legic dump" }, 
+    { 0, "hf legic info" }, 
+    { 1, "hf legic list" }, 
+    { 0, "hf legic rdbl" }, 
+    { 0, "hf legic reader" }, 
+    { 0, "hf legic restore" }, 
+    { 0, "hf legic wipe" }, 
+    { 0, "hf legic wrbl" }, 
+    { 0, "hf legic sim" }, 
+    { 0, "hf legic eload" }, 
+    { 0, "hf legic esave" }, 
+    { 0, "hf legic eview" }, 
+    { 1, "hf legic crc" }, 
+    { 1, "hf legic view" }, 
+    { 1, "hf lto help" }, 
+    { 0, "hf lto dump" }, 
+    { 0, "hf lto info" }, 
+    { 1, "hf lto list" }, 
+    { 0, "hf lto rdbl" }, 
+    { 0, "hf lto reader" }, 
+    { 0, "hf lto restore" }, 
+    { 0, "hf lto wrbl" }, 
+    { 1, "hf mf help" }, 
+    { 1, "hf mf list" }, 
+    { 0, "hf mf darkside" }, 
+    { 0, "hf mf nested" }, 
+    { 1, "hf mf hardnested" }, 
+    { 0, "hf mf staticnested" }, 
+    { 0, "hf mf autopwn" }, 
+    { 0, "hf mf nack" }, 
+    { 0, "hf mf chk" }, 
+    { 0, "hf mf fchk" }, 
+    { 1, "hf mf decrypt" }, 
+    { 0, "hf mf supercard" }, 
+    { 0, "hf mf auth4" }, 
+    { 1, "hf mf acl" }, 
+    { 0, "hf mf dump" }, 
+    { 1, "hf mf mad" }, 
+    { 0, "hf mf personalize" }, 
+    { 0, "hf mf rdbl" }, 
+    { 0, "hf mf rdsc" }, 
+    { 0, "hf mf restore" }, 
+    { 0, "hf mf setmod" }, 
+    { 1, "hf mf value" }, 
+    { 1, "hf mf view" }, 
+    { 0, "hf mf wipe" }, 
+    { 0, "hf mf wrbl" }, 
+    { 0, "hf mf sim" }, 
+    { 0, "hf mf ecfill" }, 
+    { 0, "hf mf eclr" }, 
+    { 0, "hf mf egetblk" }, 
+    { 0, "hf mf egetsc" }, 
+    { 0, "hf mf ekeyprn" }, 
+    { 0, "hf mf eload" }, 
+    { 0, "hf mf esave" }, 
+    { 0, "hf mf esetblk" }, 
+    { 0, "hf mf eview" }, 
+    { 0, "hf mf cgetblk" }, 
+    { 0, "hf mf cgetsc" }, 
+    { 0, "hf mf cload" }, 
+    { 0, "hf mf csave" }, 
+    { 0, "hf mf csetblk" }, 
+    { 0, "hf mf csetuid" }, 
+    { 0, "hf mf cview" }, 
+    { 0, "hf mf cwipe" }, 
+    { 0, "hf mf gen3uid" }, 
+    { 0, "hf mf gen3blk" }, 
+    { 0, "hf mf gen3freeze" }, 
+    { 0, "hf mf ggetblk" }, 
+    { 0, "hf mf gload" }, 
+    { 0, "hf mf gsave" }, 
+    { 0, "hf mf gsetblk" }, 
+    { 0, "hf mf gview" }, 
+    { 0, "hf mf ndefformat" }, 
+    { 0, "hf mf ndefread" }, 
+    { 0, "hf mf ndefwrite" }, 
+    { 1, "hf mfp help" }, 
+    { 0, "hf mfp info" }, 
+    { 0, "hf mfp wrp" }, 
+    { 0, "hf mfp initp" }, 
+    { 0, "hf mfp commitp" }, 
+    { 0, "hf mfp auth" }, 
+    { 0, "hf mfp rdbl" }, 
+    { 0, "hf mfp rdsc" }, 
+    { 0, "hf mfp wrbl" }, 
+    { 0, "hf mfp chk" }, 
+    { 0, "hf mfp mad" }, 
+    { 0, "hf mfp ndefread" }, 
+    { 1, "hf mfu help" }, 
+    { 1, "hf mfu keygen" }, 
+    { 1, "hf mfu pwdgen" }, 
+    { 0, "hf mfu otptear" }, 
+    { 0, "hf mfu cauth" }, 
+    { 0, "hf mfu dump" }, 
+    { 0, "hf mfu info" }, 
+    { 0, "hf mfu ndefread" }, 
+    { 0, "hf mfu rdbl" }, 
+    { 0, "hf mfu restore" }, 
+    { 1, "hf mfu view" }, 
+    { 0, "hf mfu wrbl" }, 
+    { 0, "hf mfu eload" }, 
+    { 0, "hf mfu esave" }, 
+    { 0, "hf mfu eview" }, 
+    { 0, "hf mfu sim" }, 
+    { 0, "hf mfu setpwd" }, 
+    { 0, "hf mfu setuid" }, 
+    { 1, "hf mfdes help" }, 
+    { 0, "hf mfdes info" }, 
+    { 0, "hf mfdes getuid" }, 
+    { 0, "hf mfdes default" }, 
+    { 0, "hf mfdes auth" }, 
+    { 0, "hf mfdes chk" }, 
+    { 0, "hf mfdes detect" }, 
+    { 0, "hf mfdes freemem" }, 
+    { 0, "hf mfdes setconfig" }, 
+    { 0, "hf mfdes formatpicc" }, 
+    { 1, "hf mfdes list" }, 
+    { 0, "hf mfdes mad" }, 
+    { 0, "hf mfdes lsapp" }, 
+    { 0, "hf mfdes getaids" }, 
+    { 0, "hf mfdes getappnames" }, 
+    { 0, "hf mfdes bruteaid" }, 
+    { 0, "hf mfdes createapp" }, 
+    { 0, "hf mfdes deleteapp" }, 
+    { 0, "hf mfdes selectapp" }, 
+    { 0, "hf mfdes changekey" }, 
+    { 0, "hf mfdes chkeysettings" }, 
+    { 0, "hf mfdes getkeysettings" }, 
+    { 0, "hf mfdes getkeyversions" }, 
+    { 0, "hf mfdes getfileids" }, 
+    { 0, "hf mfdes getfileisoids" }, 
+    { 0, "hf mfdes lsfiles" }, 
+    { 0, "hf mfdes dump" }, 
+    { 0, "hf mfdes createfile" }, 
+    { 0, "hf mfdes createvaluefile" }, 
+    { 0, "hf mfdes createrecordfile" }, 
+    { 0, "hf mfdes createmacfile" }, 
+    { 0, "hf mfdes deletefile" }, 
+    { 0, "hf mfdes getfilesettings" }, 
+    { 0, "hf mfdes chfilesettings" }, 
+    { 0, "hf mfdes read" }, 
+    { 0, "hf mfdes write" }, 
+    { 0, "hf mfdes value" }, 
+    { 0, "hf mfdes clearrecfile" }, 
+    { 1, "hf mfdes test" }, 
+    { 1, "hf ntag424 help" }, 
+    { 0, "hf ntag424 info" }, 
+    { 0, "hf ntag424 sdm" }, 
+    { 1, "hf ntag424 view" }, 
+    { 1, "hf seos help" }, 
+    { 0, "hf seos info" }, 
+    { 1, "hf seos list" }, 
+    { 1, "hf st25ta help" }, 
+    { 0, "hf st25ta info" }, 
+    { 1, "hf st25ta list" }, 
+    { 1, "hf st25ta ndefread" }, 
+    { 0, "hf st25ta protect" }, 
+    { 0, "hf st25ta pwd" }, 
+    { 0, "hf st25ta sim" }, 
+    { 1, "hf thinfilm help" }, 
+    { 0, "hf thinfilm info" }, 
+    { 1, "hf thinfilm list" }, 
+    { 0, "hf thinfilm sim" }, 
+    { 1, "hf topaz help" }, 
+    { 0, "hf topaz dump" }, 
+    { 1, "hf topaz list" }, 
+    { 0, "hf topaz info" }, 
+    { 0, "hf topaz reader" }, 
+    { 0, "hf topaz sim" }, 
+    { 0, "hf topaz sniff" }, 
+    { 0, "hf topaz raw" }, 
+    { 0, "hf topaz rdbl" }, 
+    { 1, "hf topaz view" }, 
+    { 0, "hf topaz wrbl" }, 
+    { 1, "hf texkom help" }, 
+    { 0, "hf texkom reader" }, 
+    { 0, "hf texkom sim" }, 
+    { 1, "hf xerox help" }, 
+    { 0, "hf xerox info" }, 
+    { 0, "hf xerox reader" }, 
+    { 0, "hf xerox dump" }, 
+    { 1, "hf waveshare help" }, 
+    { 0, "hf waveshare loadbmp" }, 
+    { 1, "hw help" }, 
+    { 0, "hw break" }, 
+    { 1, "hw connect" }, 
+    { 0, "hw dbg" }, 
+    { 0, "hw detectreader" }, 
+    { 0, "hw fpgaoff" }, 
+    { 0, "hw lcd" }, 
+    { 0, "hw lcdreset" }, 
+    { 0, "hw ping" }, 
+    { 0, "hw readmem" }, 
+    { 0, "hw reset" }, 
+    { 0, "hw setlfdivisor" }, 
+    { 0, "hw setmux" }, 
+    { 0, "hw standalone" }, 
+    { 0, "hw status" }, 
+    { 0, "hw tearoff" }, 
+    { 0, "hw tia" }, 
+    { 0, "hw tune" }, 
+    { 1, "hw version" }, 
+    { 1, "lf help" }, 
+    { 0, "lf config" }, 
+    { 0, "lf cmdread" }, 
+    { 0, "lf read" }, 
+    { 1, "lf search" }, 
+    { 0, "lf sim" }, 
+    { 0, "lf simask" }, 
+    { 0, "lf simfsk" }, 
+    { 0, "lf simpsk" }, 
+    { 0, "lf simbidir" }, 
+    { 0, "lf sniff" }, 
+    { 0, "lf tune" }, 
+    { 1, "lf awid help" }, 
+    { 1, "lf awid demod" }, 
+    { 0, "lf awid reader" }, 
+    { 0, "lf awid clone" }, 
+    { 0, "lf awid sim" }, 
+    { 0, "lf awid brute" }, 
+    { 0, "lf awid watch" }, 
+    { 1, "lf cotag help" }, 
+    { 1, "lf cotag demod" }, 
+    { 0, "lf cotag reader" }, 
+    { 1, "lf destron help" }, 
+    { 1, "lf destron demod" }, 
+    { 0, "lf destron reader" }, 
+    { 0, "lf destron clone" }, 
+    { 0, "lf destron sim" }, 
+    { 1, "lf em help" }, 
+    { 1, "lf em 410x help" }, 
+    { 1, "lf em 410x demod" }, 
+    { 0, "lf em 410x reader" }, 
+    { 0, "lf em 410x sim" }, 
+    { 0, "lf em 410x brute" }, 
+    { 0, "lf em 410x watch" }, 
+    { 0, "lf em 410x spoof" }, 
+    { 0, "lf em 410x clone" }, 
+    { 1, "lf em 4x05 help" }, 
+    { 0, "lf em 4x05 brute" }, 
+    { 0, "lf em 4x05 chk" }, 
+    { 1, "lf em 4x05 demod" }, 
+    { 0, "lf em 4x05 dump" }, 
+    { 0, "lf em 4x05 info" }, 
+    { 0, "lf em 4x05 read" }, 
+    { 1, "lf em 4x05 sniff" }, 
+    { 0, "lf em 4x05 unlock" }, 
+    { 0, "lf em 4x05 wipe" }, 
+    { 0, "lf em 4x05 write" }, 
+    { 1, "lf em 4x50 help" }, 
+    { 0, "lf em 4x50 brute" }, 
+    { 0, "lf em 4x50 chk" }, 
+    { 0, "lf em 4x50 dump" }, 
+    { 0, "lf em 4x50 info" }, 
+    { 0, "lf em 4x50 login" }, 
+    { 0, "lf em 4x50 rdbl" }, 
+    { 0, "lf em 4x50 reader" }, 
+    { 0, "lf em 4x50 restore" }, 
+    { 0, "lf em 4x50 wrbl" }, 
+    { 0, "lf em 4x50 wrpwd" }, 
+    { 0, "lf em 4x50 wipe" }, 
+    { 0, "lf em 4x50 eload" }, 
+    { 0, "lf em 4x50 esave" }, 
+    { 0, "lf em 4x50 eview" }, 
+    { 0, "lf em 4x50 sim" }, 
+    { 1, "lf em 4x70 help" }, 
+    { 0, "lf em 4x70 info" }, 
+    { 0, "lf em 4x70 write" }, 
+    { 0, "lf em 4x70 unlock" }, 
+    { 0, "lf em 4x70 auth" }, 
+    { 0, "lf em 4x70 writepin" }, 
+    { 0, "lf em 4x70 writekey" }, 
+    { 1, "lf fdxb help" }, 
+    { 1, "lf fdxb demod" }, 
+    { 0, "lf fdxb reader" }, 
+    { 0, "lf fdxb clone" }, 
+    { 0, "lf fdxb sim" }, 
+    { 1, "lf gallagher help" }, 
+    { 1, "lf gallagher demod" }, 
+    { 0, "lf gallagher reader" }, 
+    { 0, "lf gallagher clone" }, 
+    { 0, "lf gallagher sim" }, 
+    { 1, "lf gproxii help" }, 
+    { 1, "lf gproxii demod" }, 
+    { 0, "lf gproxii reader" }, 
+    { 0, "lf gproxii clone" }, 
+    { 0, "lf gproxii sim" }, 
+    { 1, "lf hid help" }, 
+    { 1, "lf hid demod" }, 
+    { 0, "lf hid reader" }, 
+    { 0, "lf hid clone" }, 
+    { 0, "lf hid sim" }, 
+    { 0, "lf hid brute" }, 
+    { 0, "lf hid watch" }, 
+    { 1, "lf hitag help" }, 
+    { 0, "lf hitag eload" }, 
+    { 1, "lf hitag list" }, 
+    { 0, "lf hitag info" }, 
+    { 0, "lf hitag reader" }, 
+    { 0, "lf hitag sim" }, 
+    { 0, "lf hitag sniff" }, 
+    { 0, "lf hitag writer" }, 
+    { 0, "lf hitag dump" }, 
+    { 0, "lf hitag cc" }, 
+    { 1, "lf idteck help" }, 
+    { 1, "lf idteck demod" }, 
+    { 0, "lf idteck reader" }, 
+    { 0, "lf idteck clone" }, 
+    { 0, "lf idteck sim" }, 
+    { 1, "lf indala help" }, 
+    { 0, "lf indala brute" }, 
+    { 1, "lf indala demod" }, 
+    { 1, "lf indala altdemod" }, 
+    { 0, "lf indala reader" }, 
+    { 0, "lf indala clone" }, 
+    { 0, "lf indala sim" }, 
+    { 1, "lf io help" }, 
+    { 1, "lf io demod" }, 
+    { 0, "lf io reader" }, 
+    { 0, "lf io clone" }, 
+    { 0, "lf io sim" }, 
+    { 0, "lf io watch" }, 
+    { 1, "lf jablotron help" }, 
+    { 1, "lf jablotron demod" }, 
+    { 0, "lf jablotron reader" }, 
+    { 0, "lf jablotron clone" }, 
+    { 0, "lf jablotron sim" }, 
+    { 1, "lf keri help" }, 
+    { 1, "lf keri demod" }, 
+    { 0, "lf keri reader" }, 
+    { 0, "lf keri clone" }, 
+    { 0, "lf keri sim" }, 
+    { 1, "lf motorola help" }, 
+    { 1, "lf motorola demod" }, 
+    { 0, "lf motorola reader" }, 
+    { 0, "lf motorola clone" }, 
+    { 0, "lf motorola sim" }, 
+    { 1, "lf nedap help" }, 
+    { 1, "lf nedap demod" }, 
+    { 0, "lf nedap reader" }, 
+    { 0, "lf nedap clone" }, 
+    { 0, "lf nedap sim" }, 
+    { 1, "lf nexwatch help" }, 
+    { 1, "lf nexwatch demod" }, 
+    { 0, "lf nexwatch reader" }, 
+    { 0, "lf nexwatch clone" }, 
+    { 0, "lf nexwatch sim" }, 
+    { 1, "lf noralsy help" }, 
+    { 1, "lf noralsy demod" }, 
+    { 0, "lf noralsy reader" }, 
+    { 0, "lf noralsy clone" }, 
+    { 0, "lf noralsy sim" }, 
+    { 1, "lf pac help" }, 
+    { 1, "lf pac demod" }, 
+    { 0, "lf pac reader" }, 
+    { 0, "lf pac clone" }, 
+    { 0, "lf pac sim" }, 
+    { 1, "lf paradox help" }, 
+    { 1, "lf paradox demod" }, 
+    { 0, "lf paradox reader" }, 
+    { 0, "lf paradox clone" }, 
+    { 0, "lf paradox sim" }, 
+    { 1, "lf pcf7931 help" }, 
+    { 0, "lf pcf7931 reader" }, 
+    { 0, "lf pcf7931 write" }, 
+    { 1, "lf pcf7931 config" }, 
+    { 1, "lf presco help" }, 
+    { 1, "lf presco demod" }, 
+    { 0, "lf presco reader" }, 
+    { 0, "lf presco clone" }, 
+    { 0, "lf presco sim" }, 
+    { 1, "lf pyramid help" }, 
+    { 1, "lf pyramid demod" }, 
+    { 0, "lf pyramid reader" }, 
+    { 0, "lf pyramid clone" }, 
+    { 0, "lf pyramid sim" }, 
+    { 1, "lf securakey help" }, 
+    { 1, "lf securakey demod" }, 
+    { 0, "lf securakey reader" }, 
+    { 0, "lf securakey clone" }, 
+    { 0, "lf securakey sim" }, 
+    { 1, "lf ti help" }, 
+    { 1, "lf ti demod" }, 
+    { 0, "lf ti reader" }, 
+    { 0, "lf ti write" }, 
+    { 1, "lf t55xx help" }, 
+    { 0, "lf t55xx clonehelp" }, 
+    { 1, "lf t55xx config" }, 
+    { 0, "lf t55xx dangerraw" }, 
+    { 1, "lf t55xx detect" }, 
+    { 0, "lf t55xx deviceconfig" }, 
+    { 0, "lf t55xx dump" }, 
+    { 1, "lf t55xx info" }, 
+    { 0, "lf t55xx p1detect" }, 
+    { 0, "lf t55xx read" }, 
+    { 0, "lf t55xx resetread" }, 
+    { 0, "lf t55xx restore" }, 
+    { 1, "lf t55xx trace" }, 
+    { 0, "lf t55xx wakeup" }, 
+    { 0, "lf t55xx write" }, 
+    { 0, "lf t55xx bruteforce" }, 
+    { 0, "lf t55xx chk" }, 
+    { 0, "lf t55xx protect" }, 
+    { 0, "lf t55xx recoverpw" }, 
+    { 1, "lf t55xx sniff" }, 
+    { 0, "lf t55xx special" }, 
+    { 0, "lf t55xx wipe" }, 
+    { 1, "lf viking help" }, 
+    { 1, "lf viking demod" }, 
+    { 0, "lf viking reader" }, 
+    { 0, "lf viking clone" }, 
+    { 0, "lf viking sim" }, 
+    { 1, "lf visa2000 help" }, 
+    { 1, "lf visa2000 demod" }, 
+    { 0, "lf visa2000 reader" }, 
+    { 0, "lf visa2000 clone" }, 
+    { 0, "lf visa2000 sim" }, 
+    { 1, "mem help" }, 
+    { 0, "mem baudrate" }, 
+    { 0, "mem dump" }, 
+    { 0, "mem info" }, 
+    { 0, "mem load" }, 
+    { 0, "mem wipe" }, 
+    { 1, "mem spiffs help" }, 
+    { 0, "mem spiffs copy" }, 
+    { 0, "mem spiffs check" }, 
+    { 0, "mem spiffs dump" }, 
+    { 0, "mem spiffs info" }, 
+    { 0, "mem spiffs mount" }, 
+    { 0, "mem spiffs remove" }, 
+    { 0, "mem spiffs rename" }, 
+    { 0, "mem spiffs test" }, 
+    { 0, "mem spiffs tree" }, 
+    { 0, "mem spiffs unmount" }, 
+    { 0, "mem spiffs upload" }, 
+    { 0, "mem spiffs view" }, 
+    { 0, "mem spiffs wipe" }, 
+    { 1, "nfc help" }, 
+    { 1, "nfc decode" }, 
+    { 0, "nfc type1 read" }, 
+    { 1, "nfc type1 help" }, 
+    { 0, "nfc type2 read" }, 
+    { 1, "nfc type2 help" }, 
+    { 0, "nfc type4a format" }, 
+    { 0, "nfc type4a read" }, 
+    { 0, "nfc type4a write" }, 
+    { 0, "nfc type4a st25taread" }, 
+    { 1, "nfc type4a help" }, 
+    { 0, "nfc type4b read" }, 
+    { 1, "nfc type4b help" }, 
+    { 0, "nfc mf cformat" }, 
+    { 0, "nfc mf cread" }, 
+    { 0, "nfc mf cwrite" }, 
+    { 0, "nfc mf pread" }, 
+    { 1, "nfc mf help" }, 
+    { 0, "nfc barcode read" }, 
+    { 0, "nfc barcode sim" }, 
+    { 1, "nfc barcode help" }, 
+    { 1, "piv help" }, 
+    { 0, "piv select" }, 
+    { 0, "piv getdata" }, 
+    { 0, "piv authsign" }, 
+    { 0, "piv scan" }, 
+    { 1, "piv list" }, 
+    { 1, "smart help" }, 
+    { 1, "smart list" }, 
+    { 0, "smart info" }, 
+    { 0, "smart reader" }, 
+    { 0, "smart raw" }, 
+    { 1, "smart upgrade" }, 
+    { 0, "smart setclock" }, 
+    { 0, "smart brute" }, 
+    { 1, "script help" }, 
+    { 1, "script list" }, 
+    { 1, "script run" }, 
+    { 1, "trace help" }, 
+    { 1, "trace extract" }, 
+    { 1, "trace list" }, 
+    { 1, "trace load" }, 
+    { 1, "trace save" }, 
+    { 1, "usart help" }, 
+    { 0, "usart btpin" }, 
+    { 0, "usart btfactory" }, 
+    { 0, "usart tx" }, 
+    { 0, "usart rx" }, 
+    { 0, "usart txrx" }, 
+    { 0, "usart txhex" }, 
+    { 0, "usart rxhex" }, 
+    { 0, "usart config" }, 
+    { 1, "wiegand help" }, 
+    { 1, "wiegand list" }, 
+    { 1, "wiegand encode" }, 
+    { 1, "wiegand decode" }, 
     {0, NULL}
 };
 
@@ -779,4 +779,4 @@ const static vocabulory_t vocabulory[] = {
 }
 #endif
 
-#endif
+#endif
\ No newline at end of file

From 6d12f0281a0d7a837879439c9d0e09cdce88544b Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 23 Jan 2023 03:26:51 +0100
Subject: [PATCH 16/19] hf telsa info - better text,  also added detection of
 the gauss key applet

---
 client/src/cmdhftesla.c | 56 +++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/client/src/cmdhftesla.c b/client/src/cmdhftesla.c
index b3b5c8939..296323319 100644
--- a/client/src/cmdhftesla.c
+++ b/client/src/cmdhftesla.c
@@ -64,26 +64,36 @@ static int info_hf_tesla(void) {
     param_gethex_to_eol("00a404000a7465736c614c6f676963", 0, aSELECT_AID, sizeof(aSELECT_AID), &aSELECT_AID_n);
     int res = ExchangeAPDU14a(aSELECT_AID, aSELECT_AID_n, activate_field, keep_field_on, response, sizeof(response), &resplen);
     if (res != PM3_SUCCESS) {
-        DropField();
-        return res;
-    }
-
-    if (resplen < 2) {
-        DropField();
-        return PM3_ESOFT;
-    }
-
-    uint16_t sw = get_sw(response, resplen);
-    if (sw != ISO7816_OK) {
-        PrintAndLogEx(ERR, "Selecting TESLA aid failed (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
         DropField();
         return PM3_ESOFT;
     }
 
     activate_field = false;
+    uint16_t sw = get_sw(response, resplen);
+
+    if ((resplen < 2) || (sw != ISO7816_OK)) {
+
+        param_gethex_to_eol("00a404000af465736c614c6f676963", 0, aSELECT_AID, sizeof(aSELECT_AID), &aSELECT_AID_n);
+        res = ExchangeAPDU14a(aSELECT_AID, aSELECT_AID_n, activate_field, keep_field_on, response, sizeof(response), &resplen);
+        if (res != PM3_SUCCESS) {
+            DropField();
+            return res;
+        }
+    }
+
+    if ((resplen < 2) || (sw != ISO7816_OK)) {
+        PrintAndLogEx(ERR, "Selecting TESLA aid failed (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
+        // DropField();
+        // return PM3_ESOFT;
+    }
+
+
     keep_field_on = true;
 
+
     // ---------------  ECDH public key file reading ----------------
+    uint8_t pk[3][65] = {{0}};
+
     for (uint8_t i = 0; i < 3; i++) {
 
         uint8_t aSELECT_PK[5] = {0x80, 0x04, i, 0x00, 0x00};
@@ -94,12 +104,7 @@ static int info_hf_tesla(void) {
 
         sw = get_sw(response, resplen);
         if (sw == ISO7816_OK) {
-            // save PK for later    
-            uint8_t pk[65] = {0};
-            memcpy(pk, response, resplen - 2);
-        
-            PrintAndLogEx(INFO, "PUBLIC KEY # %i", i);
-            PrintAndLogEx(INFO, "%s", sprint_hex_inrow(pk, sizeof(pk)));
+            memcpy(pk[i], response, resplen - 2);
         }
     }
 
@@ -194,13 +199,16 @@ static int info_hf_tesla(void) {
     PrintAndLogEx(NORMAL, "");
     PrintAndLogEx(INFO, "--- " _CYAN_("Tag Information") " ---------------------------");
     PrintAndLogEx(NORMAL, "");
-//    PrintAndLogEx(INFO, "PUBLIC KEY");
-//    PrintAndLogEx(INFO, "%zu - %s", sizeof(pk), sprint_hex_inrow(pk, sizeof(pk)));
-    PrintAndLogEx(INFO, "Form factor");
-    PrintAndLogEx(INFO, "%zu - %s", sizeof(form_factor), sprint_hex_inrow(form_factor, sizeof(form_factor)));
-    PrintAndLogEx(INFO, "VERSION");
-    PrintAndLogEx(INFO, "%zu - %s", sizeof(version), sprint_hex_inrow(version, sizeof(version)));
+    PrintAndLogEx(INFO, "PUBLIC KEY");
+    for (int i=0; i < 3; i++) {
+        PrintAndLogEx(INFO, "%d - %s", i, sprint_hex_inrow(pk[i], 65));
+    }
+    PrintAndLogEx(INFO, "Form factor... %s", sprint_hex_inrow(form_factor, sizeof(form_factor)));
+    PrintAndLogEx(INFO, "Version....... %s", sprint_hex_inrow(version, sizeof(version)));
 
+    if ((memcmp(pk[0], pk[1], 65) == 0)) {
+        PrintAndLogEx(INFO, "GaussKey detected");
+    }
     return PM3_SUCCESS;
 }
 

From c364a6821c4f7505fbb0d45c884addad473458ae Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 23 Jan 2023 03:32:38 +0100
Subject: [PATCH 17/19] hf tesla info - better textual output

---
 client/src/cmdhftesla.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/client/src/cmdhftesla.c b/client/src/cmdhftesla.c
index 296323319..2680daa90 100644
--- a/client/src/cmdhftesla.c
+++ b/client/src/cmdhftesla.c
@@ -191,8 +191,6 @@ static int info_hf_tesla(void) {
         memcpy(auth, response, sizeof(auth));
     }
 
-    PrintAndLogEx(INFO, "CHALL... %s", sprint_hex_inrow(auth, sizeof(auth)));
-
     keep_field_on = false;
     DropField();
 
@@ -203,12 +201,23 @@ static int info_hf_tesla(void) {
     for (int i=0; i < 3; i++) {
         PrintAndLogEx(INFO, "%d - %s", i, sprint_hex_inrow(pk[i], 65));
     }
-    PrintAndLogEx(INFO, "Form factor... %s", sprint_hex_inrow(form_factor, sizeof(form_factor)));
-    PrintAndLogEx(INFO, "Version....... %s", sprint_hex_inrow(version, sizeof(version)));
-
-    if ((memcmp(pk[0], pk[1], 65) == 0)) {
-        PrintAndLogEx(INFO, "GaussKey detected");
+    if (form_factor[1] == 1) {
+        PrintAndLogEx(INFO, "Form factor... %s (card)", sprint_hex_inrow(form_factor, sizeof(form_factor)));
+    } else if (form_factor[1] == 2){
+        PrintAndLogEx(INFO, "Form factor... %s (phone app)", sprint_hex_inrow(form_factor, sizeof(form_factor)));
     }
+
+    if (sizeof(version) > 0) {
+        PrintAndLogEx(INFO, "Version....... %s", sprint_hex_inrow(version, sizeof(version)));
+    }
+
+    PrintAndLogEx(INFO, "CHALL......... %s", sprint_hex_inrow(auth, sizeof(auth)));
+
+    PrintAndLogEx(INFO, "Fingerprint");
+    if ((memcmp(pk[0], pk[1], 65) == 0)) {
+        PrintAndLogEx(INFO, "  GaussKey detected");
+    }
+    // 
     return PM3_SUCCESS;
 }
 

From 8bbc5934b5719ff34773c35bc07bd86dd207cbe9 Mon Sep 17 00:00:00 2001
From: mhjack <mj@mjserv.com>
Date: Sun, 1 Jan 2023 00:59:49 -0600
Subject: [PATCH 18/19] Add detection and info command behavior for NTAG 5
 devices, enable EAS status check in info command for SLI, SLIX, SLIX-L, and
 SLIX-S tags which all support EAS mode

(cherry picked from commit a430439f05654fe62c365f4c8f5ee13cb4103dfa)
---
 client/src/cmdhf15.c | 170 ++++++++++++++++++++++++++-----------------
 1 file changed, 102 insertions(+), 68 deletions(-)

diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c
index c35df7238..76fc4869a 100644
--- a/client/src/cmdhf15.c
+++ b/client/src/cmdhf15.c
@@ -99,6 +99,7 @@ static const productName_t uidmapping[] = {
     //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) ICS2602(SLIX2)" },
+    { 0xE004011800000000LL, 0xFFFFFF1800000000LL, "NXP(Philips); IC NTP53x2/NTP5210/NTA5332(NTAG 5)" },
     { 0xE004010000000000LL, 0xFFFFFF1800000000LL, "NXP(Philips); IC SL2 ICS20/ICS21(SLI)" },
     { 0xE004011000000000LL, 0xFFFFFF1800000000LL, "NXP(Philips); IC SL2 ICS2002/ICS2102(SLIX)" },
     { 0xE004010800000000LL, 0xFFFFFF1800000000LL, "NXP(Philips); IC SL2 ICS2602(SLIX2)" },
@@ -651,6 +652,95 @@ static int CmdHF15Samples(const char *Cmd) {
     return PM3_SUCCESS;
 }
 
+static int NxpTestEAS(uint8_t *uid) 
+{
+		uint8_t fast = 1;
+    uint8_t reply = 1;
+    PacketResponseNG resp;
+    uint16_t reqlen = 0;
+    uint8_t req[PM3_CMD_DATA_SIZE] = {0};
+    
+    req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
+    req[reqlen++] = ISO15693_EAS_ALARM;
+    req[reqlen++] = 0x04; // IC manufacturer code
+    memcpy(req + 3, uid, 8); // add UID
+    reqlen += 8;
+
+    AddCrc15(req,  reqlen);
+    reqlen += 2;
+
+    clearCommandBuffer();
+    SendCommandMIX(CMD_HF_ISO15693_COMMAND, reqlen, fast, reply, req, reqlen);
+
+    if (WaitForResponseTimeout(CMD_HF_ISO15693_COMMAND, &resp, 2000) == false) {
+        PrintAndLogEx(WARNING, "iso15693 timeout");
+    } else {
+        PrintAndLogEx(NORMAL, "");
+
+
+        if (resp.length < 2) {
+            PrintAndLogEx(INFO, "  EAS (Electronic Article Surveillance) is not active");
+        } else {
+            uint8_t * recv = resp.data.asBytes;
+
+            if (!(recv[0] & ISO15_RES_ERROR)) {
+                PrintAndLogEx(INFO, "  EAS (Electronic Article Surveillance) is active.");
+                PrintAndLogEx(INFO, "  EAS sequence: %s", sprint_hex(recv + 1, 32));
+            }
+        }
+    }
+    
+    return PM3_SUCCESS;
+} 
+
+static int NxpCheckSig(uint8_t *uid) {
+		uint8_t fast = 1;
+    uint8_t reply = 1;
+    PacketResponseNG resp;
+    uint16_t reqlen = 0;
+    uint8_t req[PM3_CMD_DATA_SIZE] = {0};
+    
+		// Check if we can also read the signature
+	  req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
+	  req[reqlen++] = ISO15693_READ_SIGNATURE;
+	  req[reqlen++] = 0x04; // IC manufacturer code
+	  memcpy(req + 3, uid, 8); // add UID
+	  reqlen += 8;
+
+	  AddCrc15(req,  reqlen);
+	  reqlen += 2;
+
+	  clearCommandBuffer();
+	  SendCommandMIX(CMD_HF_ISO15693_COMMAND, reqlen, fast, reply, req, reqlen);
+
+	  if (WaitForResponseTimeout(CMD_HF_ISO15693_COMMAND, &resp, 2000) == false) {
+	      PrintAndLogEx(WARNING, "iso15693 timeout");
+	      DropField();
+	      return PM3_ETIMEOUT;
+	  }
+
+	  DropField();
+
+	  if (resp.length < 2) {
+	      PrintAndLogEx(WARNING, "iso15693 card doesn't answer to READ SIGNATURE command");
+	      return PM3_EWRONGANSWER;
+	  }
+
+	  uint8_t *recv = resp.data.asBytes;
+
+	  if ((recv[0] & ISO15_RES_ERROR) == ISO15_RES_ERROR) {
+	      PrintAndLogEx(ERR, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
+	      return PM3_EWRONGANSWER;
+	  }
+
+	  uint8_t signature[32] = {0x00};
+	  memcpy(signature, recv + 1, 32);
+
+	  nxp_15693_print_signature(uid, signature);
+	  
+	  return PM3_SUCCESS;
+}
+
 // Get NXP system information from SLIX2 tag/VICC
 static int NxpSysInfo(uint8_t *uid) {
 
@@ -732,77 +822,11 @@ static int NxpSysInfo(uint8_t *uid) {
     PrintAndLogEx(INFO, "      * Additional 32 bits feature flags are%s transmitted", ((recv[5] & 0x80) ? "" : " not"));
 
     if (support_easmode) {
-        reqlen = 0;
-        req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-        req[reqlen++] = ISO15693_EAS_ALARM;
-        req[reqlen++] = 0x04; // IC manufacturer code
-        memcpy(req + 3, uid, 8); // add UID
-        reqlen += 8;
-
-        AddCrc15(req,  reqlen);
-        reqlen += 2;
-
-        clearCommandBuffer();
-        SendCommandMIX(CMD_HF_ISO15693_COMMAND, reqlen, fast, reply, req, reqlen);
-
-        if (WaitForResponseTimeout(CMD_HF_ISO15693_COMMAND, &resp, 2000) == false) {
-            PrintAndLogEx(WARNING, "iso15693 timeout");
-        } else {
-            PrintAndLogEx(NORMAL, "");
-
-
-            if (resp.length < 2) {
-                PrintAndLogEx(INFO, "  EAS (Electronic Article Surveillance) is not active");
-            } else {
-                recv = resp.data.asBytes;
-
-                if (!(recv[0] & ISO15_RES_ERROR)) {
-                    PrintAndLogEx(INFO, "  EAS (Electronic Article Surveillance) is active.");
-                    PrintAndLogEx(INFO, "  EAS sequence: %s", sprint_hex(recv + 1, 32));
-                }
-            }
-        }
+			NxpTestEAS(uid);
     }
 
     if (support_signature) {
-        // Check if we can also read the signature
-        reqlen = 0;
-        req[reqlen++] |= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
-        req[reqlen++] = ISO15693_READ_SIGNATURE;
-        req[reqlen++] = 0x04; // IC manufacturer code
-        memcpy(req + 3, uid, 8); // add UID
-        reqlen += 8;
-
-        AddCrc15(req,  reqlen);
-        reqlen += 2;
-
-        clearCommandBuffer();
-        SendCommandMIX(CMD_HF_ISO15693_COMMAND, reqlen, fast, reply, req, reqlen);
-
-        if (WaitForResponseTimeout(CMD_HF_ISO15693_COMMAND, &resp, 2000) == false) {
-            PrintAndLogEx(WARNING, "iso15693 timeout");
-            DropField();
-            return PM3_ETIMEOUT;
-        }
-
-        DropField();
-
-        if (resp.length < 2) {
-            PrintAndLogEx(WARNING, "iso15693 card doesn't answer to READ SIGNATURE command");
-            return PM3_EWRONGANSWER;
-        }
-
-        recv = resp.data.asBytes;
-
-        if ((recv[0] & ISO15_RES_ERROR) == ISO15_RES_ERROR) {
-            PrintAndLogEx(ERR, "iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
-            return PM3_EWRONGANSWER;
-        }
-
-        uint8_t signature[32] = {0x00};
-        memcpy(signature, recv + 1, 32);
-
-        nxp_15693_print_signature(uid, signature);
+      NxpCheckSig(uid);
     }
 
     return PM3_SUCCESS;
@@ -945,6 +969,16 @@ static int CmdHF15Info(const char *Cmd) {
         PrintAndLogEx(DEBUG, "SLIX2 Detected, getting NXP System Info");
         return NxpSysInfo(uid);
     }
+    else if(data[8] == 0x04 && data[7] == 0x01 && nxp_version == 0x18) //If it is an NTAG 5 
+    {
+    		PrintAndLogEx(DEBUG, "NTAG 5 Detected, getting NXP System Info");
+        return NxpSysInfo(uid);
+    }
+    else if(data[8] == 0x04 && (data[7] == 0x01 || data[7] == 0x02 || data[7] == 0x03)) //If SLI, SLIX, SLIX-l, or SLIX-S check EAS status
+    {
+    		PrintAndLogEx(DEBUG, "SLI, SLIX, SLIX-L, or SLIX-S Detected checking EAS status");
+    		return NxpTestEAS(uid);
+    }
 
     PrintAndLogEx(NORMAL, "");
     return PM3_SUCCESS;

From 002d0ac24f245012bfe0835bd1cb44a0a176e353 Mon Sep 17 00:00:00 2001
From: mjacksn <mhjack@me.com>
Date: Mon, 23 Jan 2023 10:57:32 -0600
Subject: [PATCH 19/19] changelog addition

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4cde2d93..c456ac64d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1367,3 +1367,5 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 ### Added
  - iClass functionality: full simulation of iclass tags, so tags can be simulated with data (not only CSN). Not yet support for write/update, but readers do not seem to enforce update. (@holiman).
  - iClass decryption. Proxmark can now decrypt data on an iclass tag, but requires you to have the HID decryption key locally on your computer, as this is not bundled with the sourcecode.
+ - `hf 15 info` can detect NTAG 5 tags
+ - `hf 15 info` include an EAS status check on more of the icode tags which support EAS (SLI, SLIX, SLIX-L, and SLIX-S)
\ No newline at end of file