ADD: @pwpiwi 's latest changes to 'hf mf hardnested'

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index e5592efa4286376215442744f4b3173cc8ce035d..94a0b217d1d3707dc6d688a2171c5c90600c4d66 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -804,7 +804,7 @@ int CmdHF14AMfNestedHard(const char *Cmd)
        char ctmp;\r
        ctmp = param_getchar(Cmd, 0);\r
 \r
-       if (ctmp != 'R' && ctmp != 'r' && strlen(Cmd) < 20) {\r
+       if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) {\r
                PrintAndLog("Usage:");\r
                PrintAndLog("      hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");\r
                PrintAndLog("                       <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");\r
@@ -829,15 +829,17 @@ int CmdHF14AMfNestedHard(const char *Cmd)
        bool nonce_file_read = false;\r
        bool nonce_file_write = false;\r
        bool slow = false;\r
+       int tests = 0;\r
+       \r
        \r
        if (ctmp == 'R' || ctmp == 'r') {\r
                nonce_file_read = true;\r
                if (!param_gethex(Cmd, 1, trgkey, 12)) {\r
                        know_target_key = true;\r
                }\r
-\r
+       } else if (ctmp == 'T' || ctmp == 't') {\r
+               tests = param_get32ex(Cmd, 1, 100, 10);\r
        } else {\r
-\r
                blockNo = param_get8(Cmd, 0);\r
                ctmp = param_getchar(Cmd, 1);\r
                if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
@@ -883,13 +885,14 @@ int CmdHF14AMfNestedHard(const char *Cmd)
                }\r
        }\r
 \r
-       PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s ", \r
+       PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ", \r
                        trgBlockNo, \r
                        trgKeyType?'B':'A', \r
                        trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],\r
                        know_target_key?"":" (not set)",\r
                        nonce_file_write?"write":nonce_file_read?"read":"none",\r
-                       slow?"Yes":"No");\r
+                       slow?"Yes":"No",\r
+                       tests);\r
 \r
        int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow);\r
 \r
@@ -1040,6 +1043,7 @@ int CmdHF14AMfChk(const char *Cmd)
                                                if (!p) {\r
                                                        PrintAndLog("Cannot allocate memory for defKeys");\r
                                                        free(keyBlock);\r
+                                                       free(f);\r
                                                        return 2;\r
                                                }\r
                                                keyBlock = p;\r
@@ -1225,10 +1229,10 @@ int CmdHF14AMf1kSim(const char *Cmd)
                                                corr_uid |= (uint64_t)data[2] << 48; \r
                                                corr_uid |= (uint64_t)data[1] << 40; \r
                                                corr_uid |= (uint64_t)data[0] << 32;\r
-                                               corr_uid |= data[7] << 24;\r
-                                               corr_uid |= data[6] << 16;\r
-                                               corr_uid |= data[5] << 8;\r
-                                               corr_uid |= data[4];\r
+                                               corr_uid |= (uint64_t)data[7] << 24;\r
+                                               corr_uid |= (uint64_t)data[6] << 16;\r
+                                               corr_uid |= (uint64_t)data[5] << 8;\r
+                                               corr_uid |= (uint64_t)data[4];\r
                                tryMfk64(corr_uid, data, key);\r
                                        }\r
                                        PrintAndLog("--");\r