dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hf mfu eload - now works again :)

Browse Source
This commit is contained in:
iceman1001
2021-04-10 18:21:38 +02:00
parent 43c42a06a0
commit 5ac7b9fd9f
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/cmdhfmf.c
View File

@@ -3902,7 +3902,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
arg_lit0(NULL, "2k", "MIFARE Classic/Plus 2k"),
arg_lit0(NULL, "4k", "MIFARE Classic 4k / S70"),
arg_lit0(NULL, "ul", "MIFARE Ultralight family"),
arg_int0(NULL, "blks", "<dec>", "manually set number of blocks (overrides)"),
arg_int0("q", "qty", "<dec>", "manually set number of blocks (overrides)"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, false);
@@ -3990,7 +3990,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
// update expected blocks to match converted data.
block_cnt = datalen / 4;
PrintAndLogEx(INFO, "MIFARE Ultralight override, will use %d ( %u bytes )", block_cnt, block_cnt * block_width);
PrintAndLogEx(INFO, "MIFARE Ultralight override, will use %d blocks ( %u bytes )", block_cnt, block_cnt * block_width);
}
PrintAndLogEx(INFO, "Uploading to emulator memory");

13
client/src/cmdhfmfu.c
View File

@@ -2536,22 +2536,21 @@ static int CmdHF14AMfUeLoad(const char *Cmd) {
CLIParserContext *ctx;
CLIParserInit(&ctx, "hf mfu eload",
"It loads emul dump from the file `filename.eml`",
"hf mfu eload -u -f myfile\n"
"hf mfu eload -u -f myfile -q 57 -> load 57 blocks from myfile"
"Load emulator memory with data from `filename.eml` dump file\n"
"\nSee `script run data_mfu_bin2eml` to convert the .bin to .eml",
"hf mfu eload --ul -f hf-mfu-04010203040506.eml\n"
"hf mfu eload --ul -f hf-mfu-04010203040506.eml -q 57 -> load 57 blocks from myfile"
);
void *argtable[] = {
arg_param_begin,
arg_str1("f", "file", "<fn>", "specify a filename w/o `.eml` to load"),
arg_lit1("u", NULL, "Ultralight Family type"),
arg_str1("f", "file", "<fn>", "filename of dump"),
arg_lit1(NULL, "ul", "MIFARE Ultralight family"),
arg_int0("q", "qty", "<dec>", "number of blocks to load from eml file"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, false);
CLIParserFree(ctx);
PrintAndLogEx(HINT, "Hint: See " _YELLOW_("`script run data_mfu_bin2eml`") " to convert the .bin to .eml");
return CmdHF14AMfELoad(Cmd);
}
//