ADD: Added the HitagS from @spenneb ref:https://events.ccc.de/congress/2015/Fahrplan...

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d6cae59f0bfa46101b142cbbc43c842ce4462067..ba8295ec9aa7337c38578436426d1b8a8028d30d 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,13 +707,12 @@ 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
                // nested sectors\r
                iterations = 0;\r
-               PrintAndLog("enter nested...");\r
                bool calibrate = true;\r
 \r
                for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
@@ -747,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
@@ -1126,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
@@ -1150,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