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

print attributes refactoring

Browse source
This commit is contained in:
merlokk 2022-02-04 12:52:13 +02:00
commit 6637eb0f3f
3 changed files with 82 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

108
client/src/cipurse/cipursecore.c
View file

@ -352,6 +352,51 @@ void CIPURSEPrintFileDescriptor(uint8_t desc) {
PrintAndLogEx(INFO, "Unknown file 0x%02x", desc); PrintAndLogEx(INFO, "Unknown file 0x%02x", desc);
} }
void CIPURSEPrintDGI(uint8_t *dgi, size_t dgilen) {
if (dgilen < 3) {
PrintAndLogEx(WARNING, "DGI too small. Length: %zu", dgilen);
return;
}
uint8_t len = dgi[2];
if (len + 3 != dgilen) {
PrintAndLogEx(ERR, "DGI size does not match with record size. Length of record: %zu, DGI size: %d", dgilen, len);
return;
}
// check DGI
if (dgi[0] == 0x92 && dgi[1] == 0x00) {
PrintAndLogEx(INFO, "DGI 9200 - ADF file attributes");
} else if (dgi[0] == 0x92 && dgi[1] == 0x01) {
PrintAndLogEx(INFO, "DGI 9201 - EF file attributes");
PrintAndLogEx(INFO, "File type:");
CIPURSEPrintEFFileAttr(&dgi[3], len);
PrintAndLogEx(NORMAL, "");
} else if (dgi[0] == 0xa0 && dgi[1] == 0x0f) {
PrintAndLogEx(INFO, "DGI a00f - All key values");
if (len % 20 != 0) {
PrintAndLogEx(ERR, "Key values size must be array of 20-bite record. ADF size: %d", len);
return;
}
for (int i = 0; i < len / 20; i++) {
PrintAndLogEx(INFO, "Key[%d]............ %s", i + 1, sprint_hex_inrow(&dgi[3 + i * 20 + 0], 16));
PrintAndLogEx(INFO, " Additional info.. 0x%02x", dgi[3 + i * 20 + 16]);
uint8_t kvv[CIPURSE_KVV_LENGTH] = {0};
CipurseCGetKVV(&dgi[3 + i * 20 + 0], kvv);
bool kvvvalid = (memcmp(kvv, &dgi[3 + i * 20 + 17], 3) == 0);
PrintAndLogEx(INFO, " KVV.............. %s (%s)", sprint_hex_inrow(&dgi[3 + i * 20 + 17], 3), (kvvvalid) ? _GREEN_("valid") : _RED_("invalid"));
}
PrintAndLogEx(NORMAL, "");
} else {
PrintAndLogEx(WARNING, "Unknown DGI %02x%02x", dgi[0], dgi[1]);
}
}
static void CIPURSEPrintKeySecurityAttributes(uint8_t attr) { static void CIPURSEPrintKeySecurityAttributes(uint8_t attr) {
PrintAndLogEx(INFO, "Update right: %s", (attr & 0x01) ? "self" : "any"); PrintAndLogEx(INFO, "Update right: %s", (attr & 0x01) ? "self" : "any");
PrintAndLogEx(INFO, "Change key and rights: %s", (attr & 0x02) ? "ok" : "frozen"); PrintAndLogEx(INFO, "Change key and rights: %s", (attr & 0x02) ? "ok" : "frozen");
@ -406,6 +451,38 @@ void CIPURSEPrintART(uint8_t *artrec, size_t artlen) {
} }
} }
void CIPURSEPrintEFFileAttr(uint8_t *attr, size_t len) {
CIPURSEPrintFileDescriptor(attr[0]);
if (attr[1] == 0)
PrintAndLogEx(INFO, "SFI.... not assigned");
else
PrintAndLogEx(INFO, "SFI.... 0x%02x", attr[1]);
PrintAndLogEx(INFO, "File ID... 0x%02x%02x", attr[2], attr[3]);
if (attr[0] == 0x01 || attr[0] == 0x11)
PrintAndLogEx(INFO, "File size... %d", (attr[4] << 8) + attr[5]);
else
PrintAndLogEx(INFO, "Record num " _YELLOW_("%d") " record size " _YELLOW_("%d"), attr[4], attr[5]);
PrintAndLogEx(INFO, "Keys assigned... %d", attr[6]);
if (len >= 9) {
PrintAndLogEx(INFO, "SMR entries... %02x%02x", attr[7], attr[8]);
CIPURSEPrintSMR(&attr[7]);
}
if (len >= 10) {
PrintAndLogEx(INFO, "ART... %s", sprint_hex(&attr[9], len - 9));
CIPURSEPrintART(&attr[9], len - 9);
if (attr[6] + 1 != len - 9) {
PrintAndLogEx(WARNING, "ART length is wrong");
}
}
}
void CIPURSEPrintFileAttr(uint8_t *attr, size_t len) { void CIPURSEPrintFileAttr(uint8_t *attr, size_t len) {
if (len < 7) { if (len < 7) {
PrintAndLogEx(FAILED, "Attributes length too short"); PrintAndLogEx(FAILED, "Attributes length too short");
@ -495,36 +572,7 @@ void CIPURSEPrintFileAttr(uint8_t *attr, size_t len) {
} }
} else { } else {
PrintAndLogEx(INFO, "Type... EF"); PrintAndLogEx(INFO, "Type... EF");
CIPURSEPrintFileDescriptor(attr[0]); CIPURSEPrintEFFileAttr(attr, len);
if (attr[1] == 0)
PrintAndLogEx(INFO, "SFI.... not assigned");
else
PrintAndLogEx(INFO, "SFI.... 0x%02x", attr[1]);
PrintAndLogEx(INFO, "File ID... 0x%02x%02x", attr[2], attr[3]);
if (attr[0] == 0x01 || attr[0] == 0x11)
PrintAndLogEx(INFO, "File size... %d", (attr[4] << 8) + attr[5]);
else
PrintAndLogEx(INFO, "Record num " _YELLOW_("%d") " record size " _YELLOW_("%d"), attr[4], attr[5]);
PrintAndLogEx(INFO, "Keys assigned... %d", attr[6]);
if (len >= 9) {
PrintAndLogEx(INFO, "SMR entries... %02x%02x", attr[7], attr[8]);
CIPURSEPrintSMR(&attr[7]);
}
if (len >= 10) {
PrintAndLogEx(INFO, "ART... %s", sprint_hex(&attr[9], len - 9));
CIPURSEPrintART(&attr[9], len - 9);
if (attr[6] + 1 != len - 9) {
PrintAndLogEx(WARNING, "ART length is wrong");
}
}
} }

2
client/src/cipurse/cipursecore.h
View file

@ -63,7 +63,9 @@ void CIPURSECSetActChannelSecurityLevels(CipurseChannelSecurityLevel req, Cipurs
const char *CIPURSEGetSMR(uint8_t smr); const char *CIPURSEGetSMR(uint8_t smr);
void CIPURSEPrintSMR(uint8_t *smrrec); void CIPURSEPrintSMR(uint8_t *smrrec);
void CIPURSEPrintART(uint8_t *artrec, size_t artlen); void CIPURSEPrintART(uint8_t *artrec, size_t artlen);
void CIPURSEPrintEFFileAttr(uint8_t *attr, size_t len);
void CIPURSEPrintFileAttr(uint8_t *attr, size_t len); void CIPURSEPrintFileAttr(uint8_t *attr, size_t len);
void CIPURSEPrintFileDescriptor(uint8_t desc); void CIPURSEPrintFileDescriptor(uint8_t desc);
void CIPURSEPrintDGI(uint8_t *dgi, size_t dgilen);
#endif /* __CIPURSECORE_H__ */ #endif /* __CIPURSECORE_H__ */

13
client/src/cmdhfcipurse.c
View file

@ -1042,17 +1042,8 @@ static int CmdHFCipurseCreateDGI(const char *Cmd) {
CLIParserFree(ctx); CLIParserFree(ctx);
SetAPDULogging(APDULogging); SetAPDULogging(APDULogging);
if (verbose && hdatalen > 3) { if (verbose && hdatalen > 3)
if (hdata[0] == 0x92 && hdata[1] == 0x00) CIPURSEPrintDGI(hdata, hdatalen);
PrintAndLogEx(INFO, "DGI 9200 - ADF file attributes");
if (hdata[0] == 0x92 && hdata[1] == 0x01) {
PrintAndLogEx(INFO, "DGI 9201 - EF file attributes");
PrintAndLogEx(INFO, "File type:");
CIPURSEPrintFileDescriptor(hdata[3]);
}
if (hdata[0] == 0xa0 && hdata[1] == 0x0f)
PrintAndLogEx(INFO, "DGI a00f - All key values");
}
uint8_t buf[APDU_RES_LEN] = {0}; uint8_t buf[APDU_RES_LEN] = {0};
size_t len = 0; size_t len = 0;