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

cov 353969 353968 353927 353930

Browse source
This commit is contained in:
merlokk 2021-07-26 19:21:39 +03:00
commit 2a5a6fde81
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/src/cmdhfmfdes.c
View file

@ -4208,8 +4208,10 @@ static int CmdHF14ADesChangeKey(const char *Cmd) {
uint8_t newkeynum = arg_get_int_def(ctx, 14, 0); uint8_t newkeynum = arg_get_int_def(ctx, 14, 0);
int newkeytype = oldkeytype; int newkeytype = oldkeytype;
if (CLIGetOptionList(arg_get_str(ctx, 15), DesfireAlgoOpts, &newkeytype)) if (CLIGetOptionList(arg_get_str(ctx, 15), DesfireAlgoOpts, &newkeytype)) {
CLIParserFree(ctx);
return PM3_ESOFT; return PM3_ESOFT;
}
uint8_t newkey[DESFIRE_MAX_KEY_SIZE] = {0}; uint8_t newkey[DESFIRE_MAX_KEY_SIZE] = {0};
memset(keydata, 0x00, sizeof(keydata)); memset(keydata, 0x00, sizeof(keydata));
@ -5453,8 +5455,10 @@ static int CmdHF14ADesChFileSettings(const char *Cmd) {
settingslen = sdatalen; settingslen = sdatalen;
} else { } else {
int cmode = DCMNone; int cmode = DCMNone;
if (CLIGetOptionList(arg_get_str(ctx, 14), DesfireCommunicationModeOpts, &cmode)) if (CLIGetOptionList(arg_get_str(ctx, 14), DesfireCommunicationModeOpts, &cmode)) {
CLIParserFree(ctx);
return PM3_ESOFT; return PM3_ESOFT;
}
if (cmode == DCMPlain) if (cmode == DCMPlain)
settings[0] = 0x00; settings[0] = 0x00;
@ -5464,17 +5468,25 @@ static int CmdHF14ADesChFileSettings(const char *Cmd) {
settings[0] = 0x03; settings[0] = 0x03;
int r_mode = 0x0e; int r_mode = 0x0e;
if (CLIGetOptionList(arg_get_str(ctx, 15), DesfireFileAccessModeOpts, &r_mode)) if (CLIGetOptionList(arg_get_str(ctx, 15), DesfireFileAccessModeOpts, &r_mode)) {
CLIParserFree(ctx);
return PM3_ESOFT; return PM3_ESOFT;
}
int w_mode = 0x0e; int w_mode = 0x0e;
if (CLIGetOptionList(arg_get_str(ctx, 16), DesfireFileAccessModeOpts, &w_mode)) if (CLIGetOptionList(arg_get_str(ctx, 16), DesfireFileAccessModeOpts, &w_mode)) {
CLIParserFree(ctx);
return PM3_ESOFT; return PM3_ESOFT;
}
int rw_mode = 0x0e; int rw_mode = 0x0e;
if (CLIGetOptionList(arg_get_str(ctx, 17), DesfireFileAccessModeOpts, &rw_mode)) if (CLIGetOptionList(arg_get_str(ctx, 17), DesfireFileAccessModeOpts, &rw_mode)) {
CLIParserFree(ctx);
return PM3_ESOFT; return PM3_ESOFT;
}
int ch_mode = 0x0e; int ch_mode = 0x0e;
if (CLIGetOptionList(arg_get_str(ctx, 18), DesfireFileAccessModeOpts, &ch_mode)) if (CLIGetOptionList(arg_get_str(ctx, 18), DesfireFileAccessModeOpts, &ch_mode)) {
CLIParserFree(ctx);
return PM3_ESOFT; return PM3_ESOFT;
}
DesfireEncodeFileAcessMode(&settings[1], r_mode, w_mode, rw_mode, ch_mode) ; DesfireEncodeFileAcessMode(&settings[1], r_mode, w_mode, rw_mode, ch_mode) ;
} }
@ -6404,7 +6416,7 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
} else { } else {
res = DesfireValueFileOperations(&dctx, fileid, MFDES_GET_VALUE, &value); res = DesfireValueFileOperations(&dctx, fileid, MFDES_GET_VALUE, &value);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "Desfire GetValue command " _RED_("error") ". Result: %d", op, res); PrintAndLogEx(ERR, "Desfire GetValue command " _RED_("error") ". Result: %d", res);
DropField(); DropField();
return PM3_ESOFT; return PM3_ESOFT;
} }
@ -6422,7 +6434,7 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
} }
if (verbose) if (verbose)
PrintAndLogEx(INFO, "file settings[%d]: %s", buflen, sprint_hex(buf, buflen)); PrintAndLogEx(INFO, "file settings[%zu]: %s", buflen, sprint_hex(buf, buflen));
if (buflen < 8 || buf[0] != 0x02) { if (buflen < 8 || buf[0] != 0x02) {
PrintAndLogEx(ERR, "Desfire GetFileSettings command returns " _RED_("wrong") " data"); PrintAndLogEx(ERR, "Desfire GetFileSettings command returns " _RED_("wrong") " data");