Merge branch 'master' into allin

update 23.9.2020

client/src/cmdhf14a.c

@@ -1979,32 +1979,33 @@ int infoHF14A(bool verbose, bool do_nack_test, bool do_aid_search) {
     }
 
     int isMagic = 0;
-    if (isMifareClassic || isMifareUltralight) {
-        isMagic = detect_classic_magic();
+    if (isMifareClassic) {
+        isMagic = detect_mf_magic(true);
+    }
+    if (isMifareUltralight) {
+        isMagic = detect_mf_magic(false);
+    }
+    if (isMifareClassic) {
+        int res = detect_classic_static_nonce();
+        if (res == NONCE_STATIC)
+            PrintAndLogEx(SUCCESS, "Static nonce: " _YELLOW_("yes"));
 
-        if (isMifareClassic) {
+        if (res == NONCE_FAIL && verbose)
+            PrintAndLogEx(SUCCESS, "Static nonce:  " _RED_("read failed"));
 
-            int res = detect_classic_static_nonce();
-            if (res == NONCE_STATIC)
-                PrintAndLogEx(SUCCESS, "Static nonce: " _YELLOW_("yes"));
+        if (res == NONCE_NORMAL) {
 
-            if (res == NONCE_FAIL && verbose)
-                PrintAndLogEx(SUCCESS, "Static nonce:  " _RED_("read failed"));
+            // not static
+            res = detect_classic_prng();
+            if (res == 1)
+                PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_("weak"));
+            else if (res == 0)
+                PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("hard"));
+            else
+                PrintAndLogEx(FAILED, "Prng detection:  " _RED_("fail"));
 
-            if (res == NONCE_NORMAL) {
-
-                // not static
-                res = detect_classic_prng();
-                if (res == 1)
-                    PrintAndLogEx(SUCCESS, "Prng detection: " _GREEN_("weak"));
-                else if (res == 0)
-                    PrintAndLogEx(SUCCESS, "Prng detection: " _YELLOW_("hard"));
-                else
-                    PrintAndLogEx(FAILED, "Prng detection:  " _RED_("fail"));
-
-                if (do_nack_test)
-                    detect_classic_nackbug(false);
-            }
+            if (do_nack_test)
+                detect_classic_nackbug(false);
         }
     }
 

client/src/cmdhfmfu.c

@@ -136,7 +136,7 @@ static int usage_hf_mfu_wrbl(void) {
 
 static int usage_hf_mfu_eload(void) {
     PrintAndLogEx(NORMAL, "It loads emul dump from the file " _YELLOW_("`filename.eml`"));
-    PrintAndLogEx(NORMAL, "Hint: See " _YELLOW_("`script run dumptoemul-mfu`") " to convert the .bin to the eml");
+    PrintAndLogEx(NORMAL, "Hint: See " _YELLOW_("`script run hf_mfu_dumptoemulator`") " to convert the .bin to the eml");
     PrintAndLogEx(NORMAL, "Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
     PrintAndLogEx(NORMAL, "  Options:");
     PrintAndLogEx(NORMAL, "    h          : this help");
@@ -1984,6 +1984,7 @@ static int CmdHF14AMfUDump(const char *Cmd) {
 
     iso14a_card_select_t card;
     mfu_dump_t dump_file_data;
+    memset(&dump_file_data, 0, sizeof(dump_file_data));
     uint8_t get_version[] = {0, 0, 0, 0, 0, 0, 0, 0};
     uint8_t get_counter_tearing[][4] = {{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}};
     uint8_t get_signature[32];

client/src/mifare/mifarehost.c

@@ -1154,13 +1154,14 @@ int detect_classic_static_nonce(void) {
     return NONCE_FAIL;
 }
 
-/* try to see if card responses to "chinese magic backdoor" commands. */
-int detect_classic_magic(void) {
+/* try to see if card responses to "Chinese magic backdoor" commands. */
+int detect_mf_magic(bool is_mfc) {
 
     uint8_t isGeneration = 0;
     PacketResponseNG resp;
     clearCommandBuffer();
-    SendCommandNG(CMD_HF_MIFARE_CIDENT, NULL, 0);
+    uint8_t payload[] = { is_mfc };
+    SendCommandNG(CMD_HF_MIFARE_CIDENT, payload, sizeof(payload));
     if (WaitForResponseTimeout(CMD_HF_MIFARE_CIDENT, &resp, 1500)) {
         if (resp.status == PM3_SUCCESS)
             isGeneration = resp.data.asBytes[0];

client/src/mifare/mifarehost.h

@@ -88,7 +88,7 @@ int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data,
 
 int detect_classic_prng(void);
 int detect_classic_nackbug(bool verbose);
-int detect_classic_magic(void);
+int detect_mf_magic(bool is_mfc);
 int detect_classic_static_nonce(void);
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);
 #endif

client/src/scripting.c

@@ -55,7 +55,7 @@ static int l_clearCommandBuffer(lua_State *L) {
 }
 
 /**
- * Enable / Disable fast push mode for lua scripts like mfckeys
+ * Enable / Disable fast push mode for lua scripts like hf_mf_keycheck
  * The following params expected:
  *
  *@brief l_fast_push_mode