mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-22 14:23:50 -07:00
added no save parameter to iclass dump. Also adjusted the text for the other places.
This commit is contained in:
parent
c8f5c54257
commit
272cb2bbc5
5 changed files with 50 additions and 27 deletions
|
@ -3,7 +3,8 @@ 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...
|
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]
|
## [unreleased][unreleased]
|
||||||
- Modified `hf iclass calcnewkey` - Added calculations for old key elite and new key non elite (@Antiklesys)
|
- Changed `hf iclass dump` - now allow no save of dumped data (@iceman1001)
|
||||||
|
- Changed `hf iclass calcnewkey` - Added calculations for old key elite and new key non elite (@Antiklesys)
|
||||||
- Changed the CLI prompt to show tcp/udp if used (@iceman1001)
|
- Changed the CLI prompt to show tcp/udp if used (@iceman1001)
|
||||||
- Changed `hw ping` - now shows transfer time (@doegox)
|
- Changed `hw ping` - now shows transfer time (@doegox)
|
||||||
- Added `hf mf encodehid` - writes HID legacy credential to a empty MFC (@iceman1001)
|
- Added `hf mf encodehid` - writes HID legacy credential to a empty MFC (@iceman1001)
|
||||||
|
|
|
@ -1537,7 +1537,12 @@ static int CmdHF14BDump(const char *Cmd) {
|
||||||
|
|
||||||
print_sr_blocks(data, cardsize, card.uid);
|
print_sr_blocks(data, cardsize, card.uid);
|
||||||
|
|
||||||
if (nosave == false) {
|
if (nosave) {
|
||||||
|
PrintAndLogEx(INFO, "Called with no save option");
|
||||||
|
PrintAndLogEx(NORMAL, "");
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
// save to file
|
// save to file
|
||||||
if (fnlen < 1) {
|
if (fnlen < 1) {
|
||||||
PrintAndLogEx(INFO, "using UID as filename");
|
PrintAndLogEx(INFO, "using UID as filename");
|
||||||
|
@ -1548,7 +1553,6 @@ static int CmdHF14BDump(const char *Cmd) {
|
||||||
size_t datalen = (lastblock + 2) * ST25TB_SR_BLOCK_SIZE;
|
size_t datalen = (lastblock + 2) * ST25TB_SR_BLOCK_SIZE;
|
||||||
pm3_save_dump(filename, data, datalen, jsf14b_v2);
|
pm3_save_dump(filename, data, datalen, jsf14b_v2);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return switch_off_field_14b();
|
return switch_off_field_14b();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1754,6 +1754,7 @@ static int CmdHFiClassDump(const char *Cmd) {
|
||||||
arg_lit0("z", "dense", "dense dump output style"),
|
arg_lit0("z", "dense", "dense dump output style"),
|
||||||
arg_lit0(NULL, "force", "force unsecure card read"),
|
arg_lit0(NULL, "force", "force unsecure card read"),
|
||||||
arg_lit0(NULL, "shallow", "use shallow (ASK) reader modulation instead of OOK"),
|
arg_lit0(NULL, "shallow", "use shallow (ASK) reader modulation instead of OOK"),
|
||||||
|
arg_lit0(NULL, "ns", "no save to file"),
|
||||||
arg_param_end
|
arg_param_end
|
||||||
};
|
};
|
||||||
CLIExecWithReturn(ctx, Cmd, argtable, true);
|
CLIExecWithReturn(ctx, Cmd, argtable, true);
|
||||||
|
@ -1840,6 +1841,7 @@ static int CmdHFiClassDump(const char *Cmd) {
|
||||||
bool dense_output = g_session.dense_output || arg_get_lit(ctx, 9);
|
bool dense_output = g_session.dense_output || arg_get_lit(ctx, 9);
|
||||||
bool force = arg_get_lit(ctx, 10);
|
bool force = arg_get_lit(ctx, 10);
|
||||||
bool shallow_mod = arg_get_lit(ctx, 11);
|
bool shallow_mod = arg_get_lit(ctx, 11);
|
||||||
|
bool nosave = arg_get_lit(ctx, 12);
|
||||||
|
|
||||||
CLIParserFree(ctx);
|
CLIParserFree(ctx);
|
||||||
|
|
||||||
|
@ -2085,6 +2087,12 @@ write_dump:
|
||||||
// print the dump
|
// print the dump
|
||||||
printIclassDumpContents(tag_data, 1, (bytes_got / 8), bytes_got, dense_output);
|
printIclassDumpContents(tag_data, 1, (bytes_got / 8), bytes_got, dense_output);
|
||||||
|
|
||||||
|
if (nosave) {
|
||||||
|
PrintAndLogEx(INFO, "Called with no save option");
|
||||||
|
PrintAndLogEx(NORMAL, "");
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
// use CSN as filename
|
// use CSN as filename
|
||||||
if (filename[0] == 0) {
|
if (filename[0] == 0) {
|
||||||
strcat(filename, "hf-iclass-");
|
strcat(filename, "hf-iclass-");
|
||||||
|
|
|
@ -2665,7 +2665,12 @@ static int CmdHF14AMfUDump(const char *Cmd) {
|
||||||
|
|
||||||
printMFUdumpEx(&dump_file_data, pages, start_page);
|
printMFUdumpEx(&dump_file_data, pages, start_page);
|
||||||
|
|
||||||
if (nosave == false) {
|
if (nosave) {
|
||||||
|
PrintAndLogEx(INFO, "Called with no save option");
|
||||||
|
PrintAndLogEx(NORMAL, "");
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
// user supplied filename?
|
// user supplied filename?
|
||||||
if (fnlen < 1) {
|
if (fnlen < 1) {
|
||||||
PrintAndLogEx(INFO, "Using UID as filename");
|
PrintAndLogEx(INFO, "Using UID as filename");
|
||||||
|
@ -2682,7 +2687,6 @@ static int CmdHF14AMfUDump(const char *Cmd) {
|
||||||
if (is_partial) {
|
if (is_partial) {
|
||||||
PrintAndLogEx(WARNING, "Partial dump created. (%d of %d blocks)", pages, card_mem_size);
|
PrintAndLogEx(WARNING, "Partial dump created. (%d of %d blocks)", pages, card_mem_size);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2298,8 +2298,14 @@ static int CmdT55xxDump(const char *Cmd) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (nosave) {
|
||||||
|
PrintAndLogEx(INFO, "Called with no save option");
|
||||||
|
PrintAndLogEx(NORMAL, "");
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
// all ok, save dump to file
|
// all ok, save dump to file
|
||||||
if (success && nosave == false) {
|
if (success) {
|
||||||
|
|
||||||
// set default filename, if not set by user
|
// set default filename, if not set by user
|
||||||
if (strlen(filename) == 0) {
|
if (strlen(filename) == 0) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue