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

iso check correctly select MF

Browse source
This commit is contained in:
merlokk 2021-08-01 22:56:03 +03:00
commit 508e89a7a9
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/mifare/desfirecore.c
View file

@ -1379,12 +1379,17 @@ static bool DesfireCheckISOAuthCmd(uint32_t appAID, char *dfname, uint8_t keyNum
dctx.cmdSet = DCCISO;
bool app_level = (appAID != 0x000000);
int res = 0;
// if cant select - return false
int res = 0;
if (dfname == NULL || strnlen(dfname, 16) == 0) {
res = DesfireSelectAIDHex(&dctx, appAID, false, 0);
if (res != PM3_SUCCESS)
return false;
if (appAID == 0x000000) {
res = DesfireISOSelect(&dctx, ISSMFDFEF, NULL, 0, NULL, NULL);
if (res != PM3_SUCCESS)
return false;
} else {
res = DesfireSelectAIDHex(&dctx, appAID, false, 0);
if (res != PM3_SUCCESS)
return false;
}
} else {
res = DesfireISOSelectDF(&dctx, dfname, NULL, NULL);
if (res != PM3_SUCCESS)