info improvements

This commit is contained in:
merlokk 2021-08-03 13:22:41 +03:00
commit 7e4ad7a3f9

View file

@ -1325,11 +1325,11 @@ static int CmdHF14ADesInfo(const char *Cmd) {
PICCInfoS PICCInfo = {0}; PICCInfoS PICCInfo = {0};
uint8_t buf[250] = {0}; uint8_t aidbuf[250] = {0};
size_t buflen = 0; size_t aidbuflen = 0;
res = DesfireGetAIDList(&dctx, buf, &buflen); res = DesfireGetAIDList(&dctx, aidbuf, &aidbuflen);
if (res == PM3_SUCCESS) { if (res == PM3_SUCCESS) {
PICCInfo.appCount = buflen / 3; PICCInfo.appCount = aidbuflen / 3;
} }
if (cardtype == DESFIRE_EV2 || if (cardtype == DESFIRE_EV2 ||
@ -1353,6 +1353,15 @@ static int CmdHF14ADesInfo(const char *Cmd) {
} }
} }
if (aidbuflen > 2) {
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "--- " _CYAN_("AID list"));
PrintAndLogEx(SUCCESS, "AIDs: " NOLF);
for (int i = 0; i < aidbuflen; i += 3)
PrintAndLogEx(NORMAL, "%s %06x" NOLF, (i == 0) ? "" : ",", DesfireAIDByteToUint(&aidbuf[i]));
PrintAndLogEx(NORMAL, "\n");
}
DesfireFillPICCInfo(&dctx, &PICCInfo, true); DesfireFillPICCInfo(&dctx, &PICCInfo, true);
DesfirePrintPICCInfo(&dctx, &PICCInfo); DesfirePrintPICCInfo(&dctx, &PICCInfo);