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

auto read file improvement

Browse source
This commit is contained in:
merlokk 2021-07-28 00:07:18 +03:00
commit 17944f7d0a
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/src/cmdhfmfdes.c
View file

@ -6331,7 +6331,12 @@ static int CmdHF14ADesReadData(const char *Cmd) {
// get file settings // get file settings
if (op == RFTAuto) { if (op == RFTAuto) {
FileSettingsS fsettings; FileSettingsS fsettings;
DesfireCommunicationMode commMode = dctx.commMode;
DesfireSetCommMode(&dctx, DCMMACed);
res = DesfireGetFileSettingsStruct(&dctx, fnum, &fsettings); res = DesfireGetFileSettingsStruct(&dctx, fnum, &fsettings);
DesfireSetCommMode(&dctx, commMode);
if (res == PM3_SUCCESS) { if (res == PM3_SUCCESS) {
switch(fsettings.fileType) { switch(fsettings.fileType) {
case 0x00: case 0x00:
@ -6358,8 +6363,12 @@ static int CmdHF14ADesReadData(const char *Cmd) {
} }
} }
if (verbose) if (verbose)
PrintAndLogEx(INFO, "Got file type: %s. Option: %s", GetDesfireFileType(fsettings.fileType), CLIGetOptionListStr(DesfireReadFileTypeOpts, op)); PrintAndLogEx(INFO, "Got file type: %s. Option: %s. comm mode: %s",
GetDesfireFileType(fsettings.fileType),
CLIGetOptionListStr(DesfireReadFileTypeOpts, op),
CLIGetOptionListStr(DesfireCommunicationModeOpts, fsettings.commMode));
DesfireSetCommMode(&dctx, fsettings.commMode);
} else { } else {
PrintAndLogEx(WARNING, "GetFileSettings error. Can't get file type."); PrintAndLogEx(WARNING, "GetFileSettings error. Can't get file type.");
} }