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

move code from old part

Browse source
This commit is contained in:
merlokk 2021-07-29 17:38:11 +03:00
commit 9e24a78dc0
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/src/cmdhfmfdes.c
View file

@ -6387,15 +6387,26 @@ static int CmdHF14ADesDump(const char *Cmd) {
return res; return res;
} }
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "Application " _CYAN_("%06x") " have " _GREEN_("%zu") " files", appid, filescount);
uint8_t aid[3] = {0};
DesfireAIDUintToByte(appid, aid);
if ((aid[2] >> 4) == 0xF) {
uint16_t short_aid = ((aid[2] & 0xF) << 12) | (aid[1] << 4) | (aid[0] >> 4);
PrintAndLogEx(SUCCESS, " AID mapped to MIFARE Classic AID (MAD): " _YELLOW_("%02X"), short_aid);
PrintAndLogEx(SUCCESS, " MAD AID Cluster 0x%02X : " _YELLOW_("%s"), short_aid >> 8, cluster_to_text(short_aid >> 8));
MADDFDecodeAndPrint(short_aid);
} else {
AIDDFDecodeAndPrint(aid);
}
if (filescount == 0) { if (filescount == 0) {
PrintAndLogEx(INFO, "There is no files in the application %06x", appid); PrintAndLogEx(INFO, "There is no files in the application %06x", appid);
DropField(); DropField();
return res; return res;
} }
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "Application " _CYAN_("%06x") " have " _GREEN_("%zu") " files", appid, filescount);
res = PM3_SUCCESS; res = PM3_SUCCESS;
for (int i = 0; i < filescount; i++) { for (int i = 0; i < filescount; i++) {
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {