ADD: added some identification on between old Desfire, Desfire EV1 and Desfire EV2

[proxmark3-svn] / client / cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index af96543d58be2284bcdf35e09d768d4dcaaff63a..9b43f4118289ae109c2e8e9860ff4cf51146e3dc 100644 (file)
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -94,12 +94,14 @@ int usage_hf14_hardnested(void){
        PrintAndLog("      w    acquire nonces and write them to binary file nonces.bin");\r
        PrintAndLog("      s    slower acquisition (required by some non standard cards)");\r
        PrintAndLog("      r    read nonces.bin and start attack");\r
+       PrintAndLog("      t    tests?");\r
        PrintAndLog(" ");\r
        PrintAndLog("samples:");\r
        PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A");\r
        PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");\r
        PrintAndLog("      hf mf hardnested 0 A FFFFFFFFFFFF 4 A w s");\r
        PrintAndLog("      hf mf hardnested r");\r
+       PrintAndLog("      hf mf hardnested r a0a1a2a3a4a5");\r
        PrintAndLog(" ");\r
        PrintAndLog("Add the known target key to check if it is present in the remaining key space:");\r
        PrintAndLog("      sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");\r
@@ -109,15 +111,18 @@ int usage_hf14_chk(void){
        PrintAndLog("Usage:  hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r
        PrintAndLog("options:");\r
        PrintAndLog("      h    this help");    \r
-       PrintAndLog("      *    all sectors");\r
-       PrintAndLog("      card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
+       PrintAndLog("      *    all sectors based on card memory, other values then below defaults to 1k");\r
+       PrintAndLog("                           0 - MINI(320 bytes)");\r
+       PrintAndLog("                           1 - 1K");\r
+       PrintAndLog("                           2 - 2K");\r
+       PrintAndLog("                           4 - 4K");\r
        PrintAndLog("      d    write keys to binary file");\r
        PrintAndLog("      t    write keys to emulator memory\n");\r
        PrintAndLog(" ");\r
        PrintAndLog("samples:");\r
-       PrintAndLog("      hf mf chk 0 A 1234567890ab keys.dic");\r
-       PrintAndLog("      hf mf chk *1 ? t");\r
-       PrintAndLog("      hf mf chk *1 ? d");\r
+       PrintAndLog("      hf mf chk 0 A 1234567890ab keys.dic     -- target block 0, Key A");\r
+       PrintAndLog("      hf mf chk *1 ? t                        -- target all blocks, all keys, 1K, write to emul");\r
+       PrintAndLog("      hf mf chk *1 ? d                        -- target all blocks, all keys, 1K, write to file");\r
        return 0;\r
 }\r
 \r
@@ -218,8 +223,7 @@ END:
        return 0;\r
 }\r
 \r
-int CmdHF14AMfWrBl(const char *Cmd)\r
-{\r
+int CmdHF14AMfWrBl(const char *Cmd) {\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
@@ -268,8 +272,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
        return 0;\r
 }\r
 \r
-int CmdHF14AMfRdBl(const char *Cmd)\r
-{\r
+int CmdHF14AMfRdBl(const char *Cmd) {\r
        uint8_t blockNo = 0;\r
        uint8_t keyType = 0;\r
        uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
@@ -317,8 +320,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
   return 0;\r
 }\r
 \r
-int CmdHF14AMfRdSc(const char *Cmd)\r
-{\r
+int CmdHF14AMfRdSc(const char *Cmd) {\r
        int i;\r
        uint8_t sectorNo = 0;\r
        uint8_t keyType = 0;\r
@@ -375,8 +377,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
   return 0;\r
 }\r
 \r
-uint8_t FirstBlockOfSector(uint8_t sectorNo)\r
-{\r
+uint8_t FirstBlockOfSector(uint8_t sectorNo) {\r
        if (sectorNo < 32) {\r
                return sectorNo * 4;\r
        } else {\r
@@ -384,8 +385,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
        }\r
 }\r
 \r
-uint8_t NumBlocksPerSector(uint8_t sectorNo)\r
-{\r
+uint8_t NumBlocksPerSector(uint8_t sectorNo) {\r
        if (sectorNo < 32) {\r
                return 4;\r
        } else {\r
@@ -942,7 +942,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
        \r
        char ctmp;\r
        ctmp = param_getchar(Cmd, 0);\r
-       if (ctmp != 'H' && ctmp != 'h' ) return usage_hf14_hardnested();\r
+       if (ctmp == 'H' || ctmp == 'h' ) return usage_hf14_hardnested();\r
        if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) return usage_hf14_hardnested();\r
        \r
        bool know_target_key = false;\r
@@ -1008,9 +1008,9 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
                        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
+                       know_target_key ? "" : " (not set)",\r
+                       nonce_file_write ? "write": nonce_file_read ? "read" : "none",\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, tests);\r
@@ -1204,6 +1204,8 @@ int CmdHF14AMfChk(const char *Cmd) {
        \r
        // time\r
        clock_t t1 = clock();\r
+       time_t start, end;\r
+       time(&start);\r
        \r
        // check keys.\r
        for (trgKeyType = !keyType;  trgKeyType < 2;  (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {\r
@@ -1215,7 +1217,8 @@ int CmdHF14AMfChk(const char *Cmd) {
                        if (e_sector[i].foundKey[trgKeyType]) continue;\r
                                                \r
                        for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
-                               \r
+                               printf(".");\r
+                               fflush(stdout);                 \r
                                uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\r
                                \r
                                res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);\r
@@ -1224,19 +1227,19 @@ int CmdHF14AMfChk(const char *Cmd) {
                                        e_sector[i].foundKey[trgKeyType] = TRUE;\r
                                        break;\r
                                }\r
-                               printf(".");\r
-                               fflush(stdout);\r
                        }\r
                        b < 127 ? ( b +=4 ) : ( b += 16 );      \r
                }\r
        }\r
        t1 = clock() - t1;\r
+       time(&end);\r
+       unsigned long elapsed_time = difftime(end, start);      \r
        if ( t1 > 0 )\r
-               printf("\nTime in checkkeys: %.0f ticks\n", (float)t1);\r
+               PrintAndLog("\nTime in checkkeys: %.0f ticks %u seconds\n", (float)t1, elapsed_time);\r
 \r
+               \r
        // 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?\r
        if ( keyType != 1 ) {\r
-               \r
                PrintAndLog("testing to read key B...");\r
                for (i = 0; i < SectorsCnt; i++) {\r
                        // KEY A  but not KEY B\r