diff --git a/client/pyscripts/fm11rf08_full.py b/client/pyscripts/fm11rf08_full.py index 4eb9e2b8d..7fbb0511a 100644 --- a/client/pyscripts/fm11rf08_full.py +++ b/client/pyscripts/fm11rf08_full.py @@ -978,7 +978,7 @@ globals: lprint("====================================") lprint() - cmd = f"hf mf mad --verbose --file {dump18}" + cmd = f"hf mf mad --force --verbose --file {dump18}" lprint(f"`{cmd}`", log=False) lprint('\n`-._,-\'"`-._,-"`-._,-\'"`-._,-\'"`-._,-\'"`-._,-\'"`-._,-\'"`-._,-\'"`-._,\n') diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index e4f29c028..7c0e09ae5 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -6171,7 +6171,8 @@ static int CmdHF14AMfMAD(const char *Cmd) { arg_lit0("b", "keyb", "use key B for access printing sectors (by default: key A)"), arg_lit0(NULL, "be", "(optional, BigEndian)"), arg_lit0(NULL, "dch", "decode Card Holder information"), - arg_str0("f", "file", "", "load dump file and decode MAD"), + arg_str0("f", "file", "", "load dump file and decode MAD"), + arg_lit0(NULL, "force", "force decode (skip key check)"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, true); @@ -6185,6 +6186,7 @@ static int CmdHF14AMfMAD(const char *Cmd) { bool keyB = arg_get_lit(ctx, 4); bool swapmad = arg_get_lit(ctx, 5); bool decodeholder = arg_get_lit(ctx, 6); + bool force = arg_get_lit(ctx, 8); int fnlen = 0; char filename[FILE_PATH_SIZE] = {0}; @@ -6214,7 +6216,7 @@ static int CmdHF14AMfMAD(const char *Cmd) { } // MAD detection - if (HasMADKey(dump) == false) { + if ((HasMADKey(dump) == false) && (force == false)) { PrintAndLogEx(FAILED, "No MAD key was detected in the dump file"); free(dump); return PM3_ESOFT;