RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-22 00:06:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

add reading card holder and card publisher sectors

Browse source
This commit is contained in:
merlokk 2021-08-12 13:57:37 +03:00
parent 8c00ce7185
commit ec8d23d6bc
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
client/src/cmdhfmfdes.c
View file

@ -1609,7 +1609,7 @@ static int CmdHF14aDesMAD(const char *Cmd) {
PrintAndLogEx(WARNING, "Directory list access with CMK : " _RED_("Enabled") ". Try to read mad with Card Master Key("); PrintAndLogEx(WARNING, "Directory list access with CMK : " _RED_("Enabled") ". Try to read mad with Card Master Key(");
// print zone // print zone
PrintAndLogEx(SUCCESS, "------------------------------------ " _CYAN_("MAD") " -------------------------------------"); PrintAndLogEx(SUCCESS, "----------------------------------------- " _CYAN_("MAD") " ------------------------------------------");
bool foundFFFFFF = false; bool foundFFFFFF = false;
for (int i = 0; i < PICCInfo.appCount; i++) { for (int i = 0; i < PICCInfo.appCount; i++) {
if (AppList[i].appNum == 0xffffff) { if (AppList[i].appNum == 0xffffff) {
@ -1624,15 +1624,38 @@ static int CmdHF14aDesMAD(const char *Cmd) {
uint32_t madver = 0; uint32_t madver = 0;
res = DesfireValueFileOperations(&dctx, 0x00, MFDES_GET_VALUE, &madver); res = DesfireValueFileOperations(&dctx, 0x00, MFDES_GET_VALUE, &madver);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
PrintAndLogEx(WARNING, "Desfire GetValue for MAD version command " _RED_("error") ". Result: %d", res); PrintAndLogEx(SUCCESS, "MAD version : " _RED_("n/a"));
} else { } else {
if (madver == 3) if (madver == 3)
PrintAndLogEx(SUCCESS, "MAD version: " _GREEN_("3")); PrintAndLogEx(SUCCESS, "MAD version : " _GREEN_("3"));
else else
PrintAndLogEx(WARNING, "MAD version: " _YELLOW_("%d"), madver); PrintAndLogEx(WARNING, "MAD version : " _YELLOW_("%d"), madver);
} }
uint8_t data[250] = {0};
size_t datalen = 0;
res = DesfireReadFile(&dctx, 02, 0x000000, 0, data, &datalen);
if (res != PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "Card Holder : " _RED_("n/a"));
} else {
if (datalen > 0) {
} else {
PrintAndLogEx(SUCCESS, "Card Holder : " _YELLOW_("none"));
}
}
res = DesfireReadFile(&dctx, 02, 0x000000, 0, data, &datalen);
if (res != PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "Card Publisher: " _RED_("n/a"));
} else {
if (datalen > 0) {
} else {
PrintAndLogEx(SUCCESS, "Card Publisher: " _YELLOW_("none"));
}
}
} else { } else {
PrintAndLogEx(WARNING, _RED_("Can't select") " issuer information app (0xffffff)."); PrintAndLogEx(WARNING, _RED_("Can't select") " issuer information app (0xffffff).");
} }