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

some fixes in info command

Browse source
This commit is contained in:
merlokk 2021-08-03 00:19:11 +03:00
commit 857d67d733
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/src/cmdhfmfdes.c
View file

@ -1255,7 +1255,7 @@ static int CmdHF14ADesInfo(const char *Cmd) {
CLIExecWithReturn(ctx, Cmd, argtable, true); CLIExecWithReturn(ctx, Cmd, argtable, true);
CLIParserFree(ctx); CLIParserFree(ctx);
DropFieldDesfire(); DropField();
mfdes_info_res_t info; mfdes_info_res_t info;
int res = mfdes_get_info(&info); int res = mfdes_get_info(&info);
@ -1270,8 +1270,7 @@ static int CmdHF14ADesInfo(const char *Cmd) {
} }
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("Tag Information") " ---------------------------"); PrintAndLogEx(INFO, "---------------------------------- " _CYAN_("Tag Information") " ----------------------------------");
PrintAndLogEx(INFO, "-------------------------------------------------------------");
PrintAndLogEx(SUCCESS, " UID: " _GREEN_("%s"), sprint_hex(info.uid, info.uidlen)); PrintAndLogEx(SUCCESS, " UID: " _GREEN_("%s"), sprint_hex(info.uid, info.uidlen));
PrintAndLogEx(SUCCESS, " Batch number: " _GREEN_("%s"), sprint_hex(info.details + 7, 5)); PrintAndLogEx(SUCCESS, " Batch number: " _GREEN_("%s"), sprint_hex(info.details + 7, 5));
PrintAndLogEx(SUCCESS, " Production date: week " _GREEN_("%02x") " / " _GREEN_("20%02x"), info.details[12], info.details[13]); PrintAndLogEx(SUCCESS, " Production date: week " _GREEN_("%02x") " / " _GREEN_("20%02x"), info.details[12], info.details[13]);
@ -1296,7 +1295,7 @@ static int CmdHF14ADesInfo(const char *Cmd) {
PrintAndLogEx(INFO, " Protocol: %s", getProtocolStr(info.versionSW[6], false)); PrintAndLogEx(INFO, " Protocol: %s", getProtocolStr(info.versionSW[6], false));
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("Card capabilities")); PrintAndLogEx(INFO, "--------------------------------- " _CYAN_("Card capabilities") " ---------------------------------");
uint8_t major = info.versionSW[3]; uint8_t major = info.versionSW[3];
uint8_t minor = info.versionSW[4]; uint8_t minor = info.versionSW[4];
if (major == 0 && minor == 4) if (major == 0 && minor == 4)
@ -1324,6 +1323,15 @@ static int CmdHF14ADesInfo(const char *Cmd) {
if (res != PM3_SUCCESS) if (res != PM3_SUCCESS)
return res; return res;
PICCInfoS PICCInfo = {0};
uint8_t buf[250] = {0};
size_t buflen = 0;
res = DesfireGetAIDList(&dctx, buf, &buflen);
if (res == PM3_SUCCESS) {
PICCInfo.appCount = buflen / 3;
}
if (cardtype == DESFIRE_EV2 || if (cardtype == DESFIRE_EV2 ||
cardtype == DESFIRE_LIGHT || cardtype == DESFIRE_LIGHT ||
cardtype == DESFIRE_EV3 || cardtype == DESFIRE_EV3 ||
@ -1345,7 +1353,6 @@ static int CmdHF14ADesInfo(const char *Cmd) {
} }
} }
PICCInfoS PICCInfo = {0};
DesfireFillPICCInfo(&dctx, &PICCInfo, true); DesfireFillPICCInfo(&dctx, &PICCInfo, true);
DesfirePrintPICCInfo(&dctx, &PICCInfo); DesfirePrintPICCInfo(&dctx, &PICCInfo);
@ -1358,8 +1365,8 @@ static int CmdHF14ADesInfo(const char *Cmd) {
} else { } else {
PrintAndLogEx(SUCCESS, " Card doesn't support 'free mem' cmd"); PrintAndLogEx(SUCCESS, " Card doesn't support 'free mem' cmd");
} }
PrintAndLogEx(INFO, "-------------------------------------------------------------");
} }
PrintAndLogEx(NORMAL, "");
iso14a_card_select_t card; iso14a_card_select_t card;
@ -1402,7 +1409,7 @@ static int CmdHF14ADesInfo(const char *Cmd) {
*/ */
DropFieldDesfire(); DropField();
return PM3_SUCCESS; return PM3_SUCCESS;
} }

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

@ -1934,9 +1934,11 @@ static void PrintKeySettingsPICC(uint8_t keysettings, uint8_t numkeys, bool prin
PrintAndLogEx(SUCCESS, "[...%c] CMK is changeable : %s", (keysettings & (1 << 0)) ? '1' : '0', (keysettings & (1 << 0)) ? _GREEN_("YES") : _RED_("NO (frozen)")); PrintAndLogEx(SUCCESS, "[...%c] CMK is changeable : %s", (keysettings & (1 << 0)) ? '1' : '0', (keysettings & (1 << 0)) ? _GREEN_("YES") : _RED_("NO (frozen)"));
PrintAndLogEx(SUCCESS, ""); PrintAndLogEx(SUCCESS, "");
if (print2ndbyte) if (print2ndbyte) {
DesfirePrintCardKeyType(numkeys >> 6);
PrintAndLogEx(SUCCESS, "key count: %d", numkeys & 0x0f); PrintAndLogEx(SUCCESS, "key count: %d", numkeys & 0x0f);
} }
}
static void PrintKeySettingsApp(uint8_t keysettings, uint8_t numkeys, bool print2ndbyte) { static void PrintKeySettingsApp(uint8_t keysettings, uint8_t numkeys, bool print2ndbyte) {
// Access rights. // Access rights.