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

works

Browse source
This commit is contained in:
merlokk 2021-07-29 09:01:10 +03:00
commit 74fc92f1db
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/cmdhfmfdes.c
View file

@ -6828,7 +6828,7 @@ static int CmdHF14ADesLsFiles(const char *Cmd) {
PrintAndLogEx(WARNING, "ISO ID list returned no data"); PrintAndLogEx(WARNING, "ISO ID list returned no data");
} }
PrintAndLogEx(INFO, "---------------------------- " _CYAN_("File list") " ----------(r w rw ch)------------------"); PrintAndLogEx(INFO, "---------------------------- " _CYAN_("File list") " -----------------------(r w rw ch)-----");
for (int i = 0; i < filescount; i++) { for (int i = 0; i < filescount; i++) {
PrintAndLogEx(SUCCESS, "ID: " _GREEN_("%02x ") NOLF, FileList[i].fileNum); PrintAndLogEx(SUCCESS, "ID: " _GREEN_("%02x ") NOLF, FileList[i].fileNum);
if (isoindx > 0) { if (isoindx > 0) {

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

@ -1475,7 +1475,7 @@ void DesfireFillFileSettings(uint8_t *data, size_t datalen, FileSettingsS *fsett
void DesfirePrintFileSettingsOneLine(FileSettingsS *fsettings) { void DesfirePrintFileSettingsOneLine(FileSettingsS *fsettings) {
PrintAndLogEx(NORMAL, "(%-5s) " NOLF, GetDesfireCommunicationMode(fsettings->fileCommMode)); PrintAndLogEx(NORMAL, "(%-5s) " NOLF, GetDesfireCommunicationMode(fsettings->fileCommMode));
PrintAndLogEx(NORMAL, "[0x%02x] %-13s " NOLF, fsettings->fileType, GetDesfireFileType(fsettings->fileType)); PrintAndLogEx(NORMAL, "[0x%02x] " _CYAN_("%-13s ") NOLF, fsettings->fileType, GetDesfireFileType(fsettings->fileType));
switch (fsettings->fileType) { switch (fsettings->fileType) {
case 0x00: case 0x00:
@ -1483,27 +1483,21 @@ void DesfirePrintFileSettingsOneLine(FileSettingsS *fsettings) {
PrintAndLogEx(NORMAL, "size: %d [0x%x] " NOLF, fsettings->fileSize, fsettings->fileSize); PrintAndLogEx(NORMAL, "size: %d [0x%x] " NOLF, fsettings->fileSize, fsettings->fileSize);
break; break;
} }
/* case 0x02: { case 0x02: {
fsettings->lowerLimit = MemLeToUint4byte(&data[4]); PrintAndLogEx(NORMAL, "[%d .. %d] lim cred: 0x%02x (%d [0x%x]) " NOLF,
fsettings->upperLimit = MemLeToUint4byte(&data[8]); fsettings->lowerLimit, fsettings->upperLimit, fsettings->limitedCredit, fsettings->value, fsettings->value);
fsettings->value = MemLeToUint4byte(&data[12]);
fsettings->limitedCredit = data[16];
reclen = 4 + 13;
break; break;
} }
case 0x03: case 0x03:
case 0x04: { case 0x04: {
fsettings->recordSize = MemLeToUint3byte(&data[4]); PrintAndLogEx(NORMAL, "%d/%d record size: %d [0x%x]b " NOLF,
fsettings->maxRecordCount = MemLeToUint3byte(&data[7]); fsettings->curRecordCount, fsettings->maxRecordCount, fsettings->recordSize, fsettings->recordSize);
fsettings->curRecordCount = MemLeToUint3byte(&data[10]);
reclen = 4 + 9;
break; break;
} }
case 0x05: { case 0x05: {
fsettings->keyType = data[4]; PrintAndLogEx(NORMAL, "key type: 0x%02x version: 0x%02x " NOLF, fsettings->keyType, fsettings->keyVersion);
fsettings->keyVersion = data[5];
break; break;
}*/ }
default: { default: {
break; break;
} }