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

dump works

Browse source
This commit is contained in:
merlokk 2021-07-29 16:42:07 +03:00
commit 7510fa3837
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
client/src/cmdhfmfdes.c
View file

@ -6691,20 +6691,11 @@ static int CmdHF14ADesDump(const char *Cmd) {
//here must be application enumeration //here must be application enumeration
} }
if (noauth) { res = DesfireSelectAndAuthenticateEx(&dctx, securechann, appid, noauth, verbose);
res = DesfireSelectAIDHex(&dctx, appid, false, 0); if (res != PM3_SUCCESS) {
if (res != PM3_SUCCESS) { DropField();
PrintAndLogEx(ERR, "Desfire select " _RED_("error") "."); return res;
DropField(); }
return res;
}
} else {
res = DesfireSelectAndAuthenticate(&dctx, securechann, appid, verbose);
if (res != PM3_SUCCESS) {
DropField();
return res;
}
}
FileListS FileList = {0}; FileListS FileList = {0};
size_t filescount = 0; size_t filescount = 0;
@ -6722,12 +6713,23 @@ static int CmdHF14ADesDump(const char *Cmd) {
} }
res = PM3_SUCCESS;
for (int i = 0; i < filescount; i++) {
if (res != PM3_SUCCESS) {
DesfireSetCommMode(&dctx, DCMPlain);
res = DesfireSelectAndAuthenticateEx(&dctx, securechann, appid, noauth, verbose);
if (res != PM3_SUCCESS) {
DropField();
return res;
}
}
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--------------------------------- " _CYAN_("File %02x") " ----------------------------------", FileList[i].fileNum);
DesfirePrintFileSettingsOneLine(&FileList[i].fileSettings);
res = DesfileReadFileAndPrint(&dctx, FileList[i].fileNum, RFTAuto, 0, 0, noauth, verbose);
}
DropField(); DropField();
return PM3_SUCCESS; return PM3_SUCCESS;