Merge pull request #2254 from augustozanellato/cload_size

Add support for specifying size in `hf mf cload`

CHANGELOG.md

@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Changed `hf mf cload` - now supports specifying tag size (@augustozanellato)
  - Added `hf 14b raw --pico` - now supports picopass anticollision over ISO14443-B (@iceman1001)
  - Changed `hf 14b *` - worked apdu and comms. Improved output. Uses NG packets (@iceman1001)
  - Fixed `data manrawdecode` - now copy to demodbuf even if em4100 decode fails (@iceman1001)

client/src/cmdhfmf.c

@@ -5094,6 +5094,10 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
     void *argtable[] = {
         arg_param_begin,
         arg_str0("f", "file", "<fn>", "Specify a filename for dump file"),
+        arg_lit0(NULL, "mini", "MIFARE Classic Mini / S20"),
+        arg_lit0(NULL, "1k", "MIFARE Classic 1k / S50 (def)"),
+        arg_lit0(NULL, "2k", "MIFARE Classic/Plus 2k"),
+        arg_lit0(NULL, "4k", "MIFARE Classic 4k / S70"),
         arg_lit0(NULL, "emu", "from emulator memory"),
         arg_param_end
     };
@@ -5103,16 +5107,48 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
     char filename[FILE_PATH_SIZE] = {0};
     CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)filename, FILE_PATH_SIZE, &fnlen);
 
-    bool fill_from_emulator = arg_get_lit(ctx, 2);
+    bool m0 = arg_get_lit(ctx, 2);
+    bool m1 = arg_get_lit(ctx, 3);
+    bool m2 = arg_get_lit(ctx, 4);
+    bool m4 = arg_get_lit(ctx, 5);
+    bool fill_from_emulator = arg_get_lit(ctx, 6);
 
     CLIParserFree(ctx);
 
+    if ((m0 + m1 + m2 + m4) > 1) {
+        PrintAndLogEx(WARNING, "Only specify one MIFARE Type");
+        return PM3_EINVARG;
+    } else if ((m0 + m1 + m2 + m4) == 0) {
+        m1 = true;
+    }
+
+    char s[6];
+    memset(s, 0, sizeof(s));
+    uint16_t block_cnt = MIFARE_1K_MAXBLOCK;
+    if (m0) {
+        block_cnt = MIFARE_MINI_MAXBLOCK;
+        strncpy(s, "Mini", 5);
+    } else if (m1) {
+        block_cnt = MIFARE_1K_MAXBLOCK;
+        strncpy(s, "1K", 3);
+    } else if (m2) {
+        block_cnt = MIFARE_2K_MAXBLOCK;
+        strncpy(s, "2K", 3);
+    } else if (m4) {
+        block_cnt = MIFARE_4K_MAXBLOCK;
+        strncpy(s, "4K", 3);
+    } else {
+        PrintAndLogEx(WARNING, "Please specify a MIFARE Type");
+        return PM3_EINVARG;
+    }
+
+
     if (fill_from_emulator) {
 
         PrintAndLogEx(INFO, "Start upload to emulator memory");
         PrintAndLogEx(INFO, "." NOLF);
 
-        for (int b = 0; b < MIFARE_1K_MAXBLOCK; b++) {
+        for (int b = 0; b < block_cnt; b++) {
             int flags = 0;
             uint8_t buf8[MFBLOCK_SIZE] = {0x00};
 
@@ -5133,7 +5169,7 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
             }
 
             // Done. Magic Halt and switch off field.
-            if (b == ((MFBLOCK_SIZE * 4) - 1)) {
+            if (b == (block_cnt - 1)) {
                 flags = MAGIC_HALT + MAGIC_OFF;
             }
 
@@ -5152,14 +5188,12 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
     // reserve memory
     uint8_t *data = NULL;
     size_t bytes_read = 0;
-    int res = pm3_load_dump(filename, (void **)&data, &bytes_read, (MFBLOCK_SIZE * MIFARE_4K_MAXBLOCK));
+    int res = pm3_load_dump(filename, (void **)&data, &bytes_read, (MFBLOCK_SIZE * block_cnt));
     if (res != PM3_SUCCESS) {
         return res;
     }
 
-    // 64 or 256blocks.
+    if (bytes_read != (block_cnt * MFBLOCK_SIZE)) {
-    if (bytes_read != (MIFARE_1K_MAXBLOCK * MFBLOCK_SIZE) &&
-            bytes_read != (MIFARE_4K_MAXBLOCK * MFBLOCK_SIZE)) {
         PrintAndLogEx(ERR, "File content error. Read %zu bytes", bytes_read);
         free(data);
         return PM3_EFILE;
@@ -5183,7 +5217,7 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
         }
 
         // switch off field
-        if (blockno == MFBLOCK_SIZE * 4 - 1) {
+        if (blockno == (block_cnt - 1)) {
             flags = MAGIC_HALT + MAGIC_OFF;
         }
 
@@ -5200,24 +5234,19 @@ static int CmdHF14AMfCLoad(const char *Cmd) {
 
         blockno++;
 
-        // magic card type - mifare 1K
+        if (blockno >= block_cnt) break;
-        if (blockno >= MIFARE_1K_MAXBLOCK) break;
     }
     PrintAndLogEx(NORMAL, "\n");
 
     free(data);
 
-    // confirm number written blocks. Must be 64 or 256 blocks
+    // confirm number written blocks. Must be 20, 64 or 256 blocks
-    if (blockno != MIFARE_1K_MAXBLOCK) {
+    if (blockno != block_cnt) {
-        if (blockno != MIFARE_4K_MAXBLOCK) {
+        PrintAndLogEx(ERR, "File content error. There must be %d blocks", block_cnt);
-            PrintAndLogEx(ERR, "File content error. There must be %u blocks", MIFARE_4K_MAXBLOCK);
-            return PM3_EFILE;
-        }
-        PrintAndLogEx(ERR, "File content error. There must be %d blocks", MIFARE_1K_MAXBLOCK);
         return PM3_EFILE;
     }
 
-    PrintAndLogEx(SUCCESS, "Card loaded " _YELLOW_("%d") " blocks from file", blockno);
+    PrintAndLogEx(SUCCESS, "Card loaded " _YELLOW_("%d") " blocks from file", block_cnt);
     PrintAndLogEx(INFO, "Done!");
     return PM3_SUCCESS;
 }