ADD: some clocking for 'hf mf mifare', 'hf mf nested', 'hf mf chk'

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 83f263025510bdedb5637f8d7f73e5015970fc1a..d15a4020e9ea0af8a7aaea2e67eace8613284ce0 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -29,6 +29,7 @@ int CmdHF14AMifare(const char *Cmd)
        printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r
        printf("-------------------------------------------------------------------------\n");\r
 \r
+       time_t time1 = clock();\r
        \r
 start:\r
     clearCommandBuffer();\r
@@ -86,6 +87,7 @@ start:
                PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
        }\r
        \r
+       PrintAndLog("Time in darkside: %1.0f seconds", (float)(clock() - time1)/CLOCKS_PER_SEC);\r
        PrintAndLog("");\r
        return 0;\r
 }\r
@@ -662,8 +664,7 @@ int CmdHF14AMfNested(const char *Cmd)
                }\r
        }\r
        else { // ------------------------------------  multiple sectors working\r
-               clock_t time1;\r
-               time1 = clock();\r
+               clock_t time1 = clock();\r
 \r
                e_sector = calloc(SectorsCnt, sizeof(sector));\r
                if (e_sector == NULL) return 1;\r
@@ -733,7 +734,7 @@ int CmdHF14AMfNested(const char *Cmd)
                        }\r
                }\r
 \r
-               printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);\r
+               PrintAndLog("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);\r
                \r
                PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r
                //print them\r
@@ -804,7 +805,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 +830,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,15 +886,16 @@ 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
+       int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);\r
 \r
        if (isOK) {\r
                switch (isOK) {\r
@@ -1080,7 +1084,9 @@ int CmdHF14AMfChk(const char *Cmd)
                        }\r
                }\r
        }\r
-       \r
+       // time\r
+       time_t time1 = clock();\r
+               \r
        for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {\r
                int b=blockNo;\r
                for (int i = 0; i < SectorsCnt; ++i) {\r
@@ -1102,6 +1108,8 @@ int CmdHF14AMfChk(const char *Cmd)
                        b<127?(b+=4):(b+=16);   \r
                }\r
        }\r
+       printf("Time in checkkeys: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/keycnt/CLOCKS_PER_SEC);\r
+               \r
 \r
        if (transferToEml) {\r
                uint8_t block[16];\r
@@ -1226,10 +1234,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