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

Added actual MF DESfire enumeration

Browse source
This commit is contained in:
Anže Jenšterle 2021-02-08 01:12:14 +01:00
commit 99b1093702
No known key found for this signature in database
GPG key ID: 56821505069EBF5F
1 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/src/cmdhfmfdes.c
View file

@ -3907,7 +3907,26 @@ static int CmdHF14ADesEnumApplications(const char *Cmd) {
dfname_t dfnames[255]; dfname_t dfnames[255];
uint8_t dfname_count = 0; uint8_t dfname_count = 0;
if (handler_desfire_appids(app_ids, &app_ids_len) != PM3_SUCCESS) { int resAID = handler_desfire_appids(app_ids, &app_ids_len);
if (resAID == PM3_EAPDU_FAIL && bruteforce) {
PrintAndLogEx(WARNING, "Tag doesn't allow listing AIDs");
PrintAndLogEx(INFO, "Enumerating through all AIDs manually, this will take a while!");
for (uint32_t id = 0; id <= 0xFFFFFF; id++) {
uint8_t appId[3] = {(id & 0xFF), (id >> 8 & 0xFF), (id >> 16 & 0xFF)};
sAPDU apdu = {0x90, MFDES_SELECT_APPLICATION, 0x00, 0x00, 0x03, appId}; //0x5a
uint16_t sw = 0;
uint8_t data[255 * 5] = {0x00};
uint32_t resplen = 0;
DESFIRESendApdu(!tag->rf_field_on, true, apdu, data, sizeof(data), &resplen, &sw);
if (sw == status(MFDES_S_OPERATION_OK)) {
PrintAndLogEx(DEBUG, "Got new APPID 0x%02X%02X%02X\n", appId[2], appId[1], appId[0]);
app_ids[app_ids_len] = appId[0];
app_ids[app_ids_len+1] = appId[1];
app_ids[app_ids_len+2] = appId[2];
app_ids_len+=3;
}
}
} else if (resAID != PM3_SUCCESS) {
PrintAndLogEx(ERR, "Can't get list of applications on tag"); PrintAndLogEx(ERR, "Can't get list of applications on tag");
DropFieldDesfire(); DropFieldDesfire();
return PM3_ESOFT; return PM3_ESOFT;