RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-09 09:39:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

prettify info command

Browse source
This commit is contained in:
merlokk 2022-02-02 16:47:07 +02:00
parent 2e35a42e20
commit 9912faa574
1 changed files with 34 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
client/src/cmdhfcipurse.c
View file

@ -82,6 +82,28 @@ static uint16_t defaultFileId = 0x2ff7;
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
static int SelectAndPrintInfoFile(void) {
uint8_t buf[APDU_RES_LEN] = {0};
size_t len = 0;
uint16_t sw = 0;
int res = CIPURSESelectFile(0x2ff7, buf, sizeof(buf), &len, &sw);
if (res != 0 || sw != 0x9000)
return PM3_EAPDU_FAIL;
res = CIPURSEReadBinary(0, buf, sizeof(buf), &len, &sw);
if (res != 0 || sw != 0x9000)
return PM3_EAPDU_FAIL;
if (len > 0) {
PrintAndLogEx(INFO, "Info file ( " _GREEN_("ok") " )");
PrintAndLogEx(INFO, "[%zu]: %s", len, sprint_hex(buf, len));
CIPURSEPrintInfoFile(buf, len);
PrintAndLogEx(INFO, "");
}
return PM3_SUCCESS;
}
static int CmdHFCipurseInfo(const char *Cmd) { static int CmdHFCipurseInfo(const char *Cmd) {
CLIParserContext *ctx; CLIParserContext *ctx;
CLIParserInit(&ctx, "hf cipurse info", CLIParserInit(&ctx, "hf cipurse info",
@ -107,10 +129,14 @@ static int CmdHFCipurseInfo(const char *Cmd) {
uint16_t sw = 0; uint16_t sw = 0;
bool mfExist = false; bool mfExist = false;
bool infoPrinted = false;
int res = CIPURSESelectMFEx(true, true, buf, sizeof(buf), &len, &sw); int res = CIPURSESelectMFEx(true, true, buf, sizeof(buf), &len, &sw);
if (res == PM3_SUCCESS && sw == 0x9000) { if (res == PM3_SUCCESS && sw == 0x9000) {
mfExist = true; mfExist = true;
PrintAndLogEx(INFO, _CYAN_("MasterFile") " exist and can be selected."); PrintAndLogEx(INFO, _CYAN_("MasterFile") " exist and can be selected.");
res = SelectAndPrintInfoFile();
infoPrinted = (res == PM3_SUCCESS);
} }
for (int i = 0; i < ARRAYLEN(PxSE_AID_LIST); i++) { for (int i = 0; i < ARRAYLEN(PxSE_AID_LIST); i++) {
@ -122,6 +148,7 @@ static int CmdHFCipurseInfo(const char *Cmd) {
PrintAndLogEx(INFO, "PxSE data:"); PrintAndLogEx(INFO, "PxSE data:");
TLVPrintFromBuffer(buf, len); TLVPrintFromBuffer(buf, len);
} }
PrintAndLogEx(INFO, "");
} }
} }
@ -130,6 +157,7 @@ static int CmdHFCipurseInfo(const char *Cmd) {
DropField(); DropField();
return res; return res;
} }
PrintAndLogEx(INFO, "Application `AF F1` selected " _GREEN_("successfully"));
if (sw != 0x9000) { if (sw != 0x9000) {
if (sw == 0x0000) { if (sw == 0x0000) {
@ -147,22 +175,12 @@ static int CmdHFCipurseInfo(const char *Cmd) {
PrintAndLogEx(INFO, "Cipurse card ( " _GREEN_("ok") " )"); PrintAndLogEx(INFO, "Cipurse card ( " _GREEN_("ok") " )");
res = CIPURSESelectFile(0x2ff7, buf, sizeof(buf), &len, &sw); if (!infoPrinted) {
if (res != 0 || sw != 0x9000) { res = SelectAndPrintInfoFile();
DropField(); if (res != PM3_SUCCESS) {
return PM3_SUCCESS; DropField();
} return PM3_SUCCESS;
}
res = CIPURSEReadBinary(0, buf, sizeof(buf), &len, &sw);
if (res != 0 || sw != 0x9000) {
DropField();
return PM3_SUCCESS;
}
if (len > 0) {
PrintAndLogEx(INFO, "Info file ( " _GREEN_("ok") " )");
PrintAndLogEx(INFO, "[%zu]: %s", len, sprint_hex(buf, len));
CIPURSEPrintInfoFile(buf, len);
} }
DropField(); DropField();