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

text

Browse source
This commit is contained in:
iceman1001 2022-10-24 18:49:08 +02:00
commit 8d24e105ea
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1828,8 +1828,8 @@ void DesfirePrintAppList(DesfireContext_t *dctx, PICCInfo_t *PICCInfo, AppListS
for (int i = 0; i < PICCInfo->appCount; i++) { for (int i = 0; i < PICCInfo->appCount; i++) {
PrintAndLogEx(SUCCESS, _CYAN_("Application number: 0x%02X"), appList[i].appNum); PrintAndLogEx(SUCCESS, _CYAN_("Application number: 0x%02X"), appList[i].appNum);
PrintAndLogEx(SUCCESS," ISO id.... " _GREEN_("0x%04X"), appList[i].appISONum); PrintAndLogEx(SUCCESS, " ISO id.... " _GREEN_("0x%04X"), appList[i].appISONum);
PrintAndLogEx(SUCCESS," DF name... " _GREEN_("%s") " ( %s)", appList[i].appDFName, sprint_hex((uint8_t*)appList[i].appDFName, sizeof(appList[i].appDFName))); PrintAndLogEx(SUCCESS, " DF name... " _GREEN_("%s") " ( %s)", appList[i].appDFName, sprint_hex((uint8_t *)appList[i].appDFName, sizeof(appList[i].appDFName)));
DesfirePrintAIDFunctions(appList[i].appNum); DesfirePrintAIDFunctions(appList[i].appNum);
@ -2689,11 +2689,11 @@ void DesfirePrintCreateFileSettings(uint8_t filetype, uint8_t *data, size_t len)
PrintAndLogEx(INFO, "---- " _CYAN_("Create file settings") " ----"); PrintAndLogEx(INFO, "---- " _CYAN_("Create file settings") " ----");
PrintAndLogEx(SUCCESS, "File type : %s", ftyperec->text); PrintAndLogEx(SUCCESS, "File type : %s", ftyperec->text);
PrintAndLogEx(SUCCESS, "File number : 0x%02x (%d)", data[0], data[0]); PrintAndLogEx(SUCCESS, "File number : 0x%02X (%d)", data[0], data[0]);
size_t xlen = 1; size_t xlen = 1;
if (ftyperec->mayHaveISOfid) { if (ftyperec->mayHaveISOfid) {
if (isoidpresent) { if (isoidpresent) {
PrintAndLogEx(SUCCESS, "File ISO number : 0x%04x", MemLeToUint2byte(&data[xlen])); PrintAndLogEx(SUCCESS, "File ISO number : 0x%04X", MemLeToUint2byte(&data[xlen]));
xlen += 2; xlen += 2;
} else { } else {
PrintAndLogEx(SUCCESS, "File ISO number : n/a"); PrintAndLogEx(SUCCESS, "File ISO number : n/a");
@ -2705,7 +2705,7 @@ void DesfirePrintCreateFileSettings(uint8_t filetype, uint8_t *data, size_t len)
PrintAndLogEx(SUCCESS, "Additional access: %s", (addaccess) ? "Yes" : "No"); PrintAndLogEx(SUCCESS, "Additional access: %s", (addaccess) ? "Yes" : "No");
xlen++; xlen++;
PrintAndLogEx(SUCCESS, "Access rights : %04x", MemLeToUint2byte(&data[xlen])); PrintAndLogEx(SUCCESS, "Access rights : %04X", MemLeToUint2byte(&data[xlen]));
DesfirePrintAccessRight(&data[xlen]); DesfirePrintAccessRight(&data[xlen]);
xlen += 2; xlen += 2;