ADD: more keys

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 3142fcd88d0a497b9d1524077048ef9fc60d0e5d..adfd5ecb588e2483688c2ab8e8b30f23d127c940 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -101,7 +101,7 @@ start:
        \r
        t1 = clock() - t1;\r
        if ( t1 > 0 )\r
-               PrintAndLog("Time in darkside: %.0f ticks - %4.2f sec\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC);\r
+               PrintAndLog("Time in darkside: %.0f ticks\n", (float)t1);\r
        return 0;\r
 }\r
 \r
@@ -593,10 +593,11 @@ int CmdHF14AMfNested(const char *Cmd)
                PrintAndLog("t - transfer keys into emulator memory");\r
                PrintAndLog("d - write keys to binary file");\r
                PrintAndLog(" ");\r
-               PrintAndLog("      sample1: hf mf nested 1 0 A FFFFFFFFFFFF ");\r
-               PrintAndLog("      sample2: hf mf nested 1 0 A FFFFFFFFFFFF t ");\r
-               PrintAndLog("      sample3: hf mf nested 1 0 A FFFFFFFFFFFF d ");\r
-               PrintAndLog("      sample4: hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r
+               PrintAndLog(" samples:");\r
+               PrintAndLog("              hf mf nested 1 0 A FFFFFFFFFFFF ");\r
+               PrintAndLog("              hf mf nested 1 0 A FFFFFFFFFFFF t ");\r
+               PrintAndLog("              hf mf nested 1 0 A FFFFFFFFFFFF d ");\r
+               PrintAndLog("              hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r
                return 0;\r
        }       \r
        \r
@@ -706,7 +707,7 @@ int CmdHF14AMfNested(const char *Cmd)
                }\r
                clock_t t2 = clock() - t1;\r
                if ( t2 > 0 )\r
-                       PrintAndLog("Time to check 6 known keys: %.0f ticks %4.2f sec", (float)t2, ((float)t2)/CLOCKS_PER_SEC);\r
+                       PrintAndLog("Time to check 6 known keys: %.0f ticks", (float)t2 );\r
 \r
                PrintAndLog("enter nested..."); \r
                \r
@@ -746,7 +747,7 @@ int CmdHF14AMfNested(const char *Cmd)
                \r
                t1 = clock() - t1;\r
                if ( t1 > 0 )\r
-                       PrintAndLog("Time in nested: %.0f ticks %4.2f sec (%4.2f sec per key)\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);\r
+                       PrintAndLog("Time in nested: %.0f ticks \n", (float)t1);\r
 \r
                // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
                PrintAndLog("trying to read key B...");\r
@@ -1125,7 +1126,7 @@ int CmdHF14AMfChk(const char *Cmd)
        clock_t t1 = clock();\r
        \r
        // check keys.\r
-       for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {\r
+       for (trgKeyType = !keyType;  trgKeyType < 2;  (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {\r
 \r
                int b = blockNo;\r
                for (int i = 0; i < SectorsCnt; ++i) {\r
@@ -1149,14 +1150,14 @@ int CmdHF14AMfChk(const char *Cmd)
                                        e_sector[i].Key[trgKeyType] = 0xffffffffffff;\r
                                        e_sector[i].foundKey[trgKeyType] = FALSE;\r
                                }\r
+                               printf(".");\r
                        }\r
                        b < 127 ? ( b +=4 ) : ( b += 16 );      \r
                }\r
        }\r
-       \r
        t1 = clock() - t1;\r
        if ( t1 > 0 )\r
-               printf("Time in checkkeys: %.0f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);\r
+               printf("\nTime in checkkeys: %.0f ticks\n", (float)t1);\r
 \r
        // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
        PrintAndLog("testing to read B...");\r
@@ -1718,11 +1719,13 @@ int CmdHF14AMfCSetUID(const char *Cmd)
        int argi=0;\r
 \r
        if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') {\r
-               PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");\r
-               PrintAndLog("sample:  hf mf csetuid 01020304");\r
-               PrintAndLog("sample:  hf mf csetuid 01020304 0004 08 w");\r
                PrintAndLog("Set UID, ATQA, and SAK for magic Chinese card (only works with such cards)");\r
                PrintAndLog("If you also want to wipe the card then add 'w' at the end of the command line.");\r
+               PrintAndLog("");\r
+               PrintAndLog("Usage:  hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");\r
+               PrintAndLog("");\r
+               PrintAndLog("sample:  hf mf csetuid 01020304");\r
+               PrintAndLog("         hf mf csetuid 01020304 0004 08 w");\r
                return 0;\r
        }\r
 \r
@@ -1763,7 +1766,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
 \r
        PrintAndLog("--wipe card:%s  uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));\r
 \r
-       res = mfCSetUID(uid, (atqaPresent)?atqa:NULL, (atqaPresent)?sak:NULL, oldUid, wipeCard);\r
+       res = mfCSetUID(uid, (atqaPresent) ? atqa : NULL, (atqaPresent) ? sak : NULL, oldUid, wipeCard);\r
        if (res) {\r
                        PrintAndLog("Can't set UID. error=%d", res);\r
                        return 1;\r