github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 02:27:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

hf mf darkside - now use cliparser

Browse source
This commit is contained in:
tcprst 2021-02-07 15:20:16 -05:00
commit 0ade8a5505
No known key found for this signature in database
GPG key ID: 9145EAF5121AED25
2 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
client/src/cmdhfmf.c
View file

@ -42,18 +42,6 @@
static int CmdHelp(const char *Cmd);
static int usage_hf14_mifare(void) {
PrintAndLogEx(NORMAL, "Usage: hf mf darkside <block number> <A|B>");
PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " h this help");
PrintAndLogEx(NORMAL, " <block number> (Optional) target other block");
PrintAndLogEx(NORMAL, " <A|B> (optional) target key type");
PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, _YELLOW_(" hf mf darkside"));
PrintAndLogEx(NORMAL, _YELLOW_(" hf mf darkside 16"));
PrintAndLogEx(NORMAL, _YELLOW_(" hf mf darkside 16 B"));
return PM3_SUCCESS;
}
static int usage_hf14_mfsim(void) {
PrintAndLogEx(NORMAL, "Usage: hf mf sim [u <uid>] [n <numreads>] [t] [a <ATQA>] [s <SAK>] [i] [x] [e] [v]");
PrintAndLogEx(NORMAL, "Options:");
@ -692,17 +680,31 @@ static char GetFormatFromSector(uint8_t sectorNo) {
}
static int CmdHF14AMfDarkside(const char *Cmd) {
uint8_t blockno = 0, key_type = MIFARE_AUTH_KEYA;
uint64_t key = 0;
CLIParserContext *ctx;
CLIParserInit(&ctx, "hf mf darkside",
"Darkside attack",
"hf mf darkside\n"
"hf mf darkside -b 16\n"
"hf mf darkside -b 16 --keyb\n");
char cmdp = tolower(param_getchar(Cmd, 0));
if (cmdp == 'h') return usage_hf14_mifare();
void *argtable[] = {
arg_param_begin,
arg_int0("b", "block", "<dec> ", "Simulation type to use"),
arg_lit0(NULL, "keyb", "Target key B instead of default key A"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
blockno = param_get8(Cmd, 0);
uint8_t blockno = arg_get_u32_def(ctx, 1, 0);
cmdp = tolower(param_getchar(Cmd, 1));
if (cmdp == 'b')
uint8_t key_type = MIFARE_AUTH_KEYA;
if (arg_get_lit(ctx, 2)) {
PrintAndLogEx(INFO, "Targeting key B");
key_type = MIFARE_AUTH_KEYB;
}
uint64_t key = 0;
int isOK = mfDarkside(blockno, key_type, &key);
PrintAndLogEx(NORMAL, "");

1
doc/cliparser_todo.txt
View file

@ -57,7 +57,6 @@ hf felica rqspecver
hf felica resetmode
hf felica litesim
hf felica litedump
hf mf darkside
hf mf nested
hf mf hardnested
hf mf staticnested