RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-10 18:24:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

textual

Browse source
This commit is contained in:
iceman1001 2020-01-25 14:29:35 +01:00
parent cf65145353
commit 28c6a5dc2d
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
client/cmdhfmf.c
View file

@ -1545,6 +1545,10 @@ static int CmdHF14AMfNestedStatic(const char *Cmd) {
return PM3_EOPABORTED; return PM3_EOPABORTED;
} }
if (IfPm3Flash()) {
PrintAndLogEx(INFO, "RDV4 with flashmemory supported detected.");
}
uint64_t t1 = msclock(); uint64_t t1 = msclock();
e_sector = calloc(SectorsCnt, sizeof(sector_t)); e_sector = calloc(SectorsCnt, sizeof(sector_t));
@ -3987,13 +3991,13 @@ static int CmdHF14AMfCWipe(const char *cmd) {
CLIParserInit("hf mf cwipe", CLIParserInit("hf mf cwipe",
"Wipe gen1 magic chinese card. Set UID/ATQA/SAK/Data/Keys/Access to default values.", "Wipe gen1 magic chinese card. Set UID/ATQA/SAK/Data/Keys/Access to default values.",
"Usage:\n\thf mf cwipe -> wipe card.\n" "Usage:\n\thf mf cwipe -> wipe card.\n"
"\thf mfp mf cwipe -u 09080706 -a 0004 -s 18 -> set UID, ATQA and SAK and wipe card."); "\thf mf cwipe -u 09080706 -a 0004 -s 18 -- set UID, ATQA and SAK and wipe card.");
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
arg_str0("uU", "uid", "<HEX UID (4b)>", "UID for card"), arg_str0("uU", "uid", "<UID (hex 4b)>", "UID for card"),
arg_str0("aA", "atqa", "<HEX ATQA (2b)>", "ATQA for card"), arg_str0("aA", "atqa", "<ATQA (hex 2b)>", "ATQA for card"),
arg_str0("sS", "sak", "<HEX SAK (1b)>", "SAK for card"), arg_str0("sS", "sak", "<SAK (hex 1b)>", "SAK for card"),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(cmd, argtable, true); CLIExecWithReturn(cmd, argtable, true);
@ -4008,11 +4012,11 @@ static int CmdHF14AMfCWipe(const char *cmd) {
return PM3_EINVARG; return PM3_EINVARG;
} }
if (atqaLen && atqaLen != 2) { if (atqaLen && atqaLen != 2) {
PrintAndLogEx(ERR, "UID length must be 2 bytes instead of: %d", atqaLen); PrintAndLogEx(ERR, "ATQA length must be 2 bytes instead of: %d", atqaLen);
return PM3_EINVARG; return PM3_EINVARG;
} }
if (sakLen && sakLen != 1) { if (sakLen && sakLen != 1) {
PrintAndLogEx(ERR, "UID length must be 1 byte instead of: %d", sakLen); PrintAndLogEx(ERR, "SAK length must be 1 byte instead of: %d", sakLen);
return PM3_EINVARG; return PM3_EINVARG;
} }