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

add get key versions to lsapp

Browse source
This commit is contained in:
merlokk 2021-08-02 17:03:50 +03:00
commit d27c340ab0
2 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/src/cmdhfmfdes.c
View file

@ -6064,10 +6064,18 @@ static int CmdHF14ADesLsApp(const char *Cmd) {
uint8_t keysettings0 = 0; uint8_t keysettings0 = 0;
uint8_t numkeys0 = 0; uint8_t numkeys0 = 0;
uint8_t keyVer0 = 0;
res = DesfireGetKeySettings(&dctx, buf, &buflen); res = DesfireGetKeySettings(&dctx, buf, &buflen);
if (res == PM3_SUCCESS && buflen >= 2) { if (res == PM3_SUCCESS && buflen >= 2) {
keysettings0 = buf[0]; keysettings0 = buf[0];
numkeys0 = buf[1]; numkeys0 = buf[1];
if ((numkeys0 & 0x1f) > 0) {
uint8_t keyNum0 = numkeys0 & 0x1f;
res = DesfireGetKeyVersion(&dctx, &keyNum0, 1, buf, &buflen);
if (res == PM3_SUCCESS && buflen > 0) {
keyVer0 = buf[0];
}
}
} }
if (appcount > 0) { if (appcount > 0) {
@ -6083,6 +6091,14 @@ static int CmdHF14ADesLsApp(const char *Cmd) {
AppList[i].numberOfKeys = AppList[i].numKeysRaw & 0x1f; AppList[i].numberOfKeys = AppList[i].numKeysRaw & 0x1f;
AppList[i].isoFileIDEnabled = ((AppList[i].numKeysRaw & 0x20) != 0); AppList[i].isoFileIDEnabled = ((AppList[i].numKeysRaw & 0x20) != 0);
AppList[i].keyType = DesfireKeyTypeToAlgo(AppList[i].numKeysRaw >> 6); AppList[i].keyType = DesfireKeyTypeToAlgo(AppList[i].numKeysRaw >> 6);
if (AppList[i].numberOfKeys > 0)
for (uint8_t keyn = 0; keyn < AppList[i].numberOfKeys; keyn++) {
res = DesfireGetKeyVersion(&dctx, &keyn, 1, buf, &buflen);
if (res == PM3_SUCCESS && buflen > 0) {
AppList[i].keyVersions[keyn] = buf[0];
}
}
} }
} }
} }
@ -6102,11 +6118,13 @@ static int CmdHF14ADesLsApp(const char *Cmd) {
PrintAndLogEx(SUCCESS, "Applications count: " _GREEN_("%zu") " free memory " _GREEN_("%d"), appcount, freemem); PrintAndLogEx(SUCCESS, "Applications count: " _GREEN_("%zu") " free memory " _GREEN_("%d"), appcount, freemem);
PrintAndLogEx(SUCCESS, "PICC level auth commands: " NOLF); PrintAndLogEx(SUCCESS, "PICC level auth commands: " NOLF);
DesfireCheckAuthCommandsPrint(&authCmdCheck0); DesfireCheckAuthCommandsPrint(&authCmdCheck0);
if (numkeys0 > 0) if (numkeys0 > 0) {
PrintKeySettings(keysettings0, numkeys0, false, true); PrintKeySettings(keysettings0, numkeys0, false, true);
PrintAndLogEx(SUCCESS, "PICC key 0 version: %d (0x%02x)", keyVer0, keyVer0);
}
if (appcount > 0) { if (appcount > 0) {
PrintAndLogEx(SUCCESS, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "-------------- " _CYAN_("Alications list") " --------------"); PrintAndLogEx(SUCCESS, "-------------- " _CYAN_("Alications list") " --------------");
for (int i = 0; i < appcount; i++) { for (int i = 0; i < appcount; i++) {
@ -6119,6 +6137,14 @@ static int CmdHF14ADesLsApp(const char *Cmd) {
PrintAndLogEx(SUCCESS, ""); PrintAndLogEx(SUCCESS, "");
if (AppList[i].numberOfKeys > 0) { if (AppList[i].numberOfKeys > 0) {
PrintKeySettings(AppList[i].keySettings, AppList[i].numKeysRaw, true, true); PrintKeySettings(AppList[i].keySettings, AppList[i].numKeysRaw, true, true);
if (AppList[i].numberOfKeys > 0) {
PrintAndLogEx(SUCCESS, "Key versions [0..%d]: " NOLF, AppList[i].numberOfKeys - 1);
for (uint8_t keyn = 0; keyn < AppList[i].numberOfKeys; keyn++) {
PrintAndLogEx(NORMAL, "%s %02x" NOLF, (keyn == 0) ? "" : ",", AppList[i].keyVersions[keyn]);
}
PrintAndLogEx(NORMAL, "\n");
}
} }
} }
} }

2
client/src/mifare/desfirecore.h
View file

@ -104,6 +104,8 @@ typedef struct {
bool isoFileIDEnabled; // from numKeysRaw bool isoFileIDEnabled; // from numKeysRaw
uint8_t numberOfKeys; // from numKeysRaw uint8_t numberOfKeys; // from numKeysRaw
DesfireCryptoAlgorythm keyType; // from numKeysRaw DesfireCryptoAlgorythm keyType; // from numKeysRaw
uint8_t keyVersions[16];
} AppListElmS; } AppListElmS;
typedef AppListElmS AppListS[64]; typedef AppListElmS AppListS[64];