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

textual

Browse source
This commit is contained in:
iceman1001 2024-04-20 08:47:49 +02:00
commit b09c0e0d5f
3 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/src/cmdhfmfdes.c
View file

@ -144,6 +144,7 @@ typedef enum {
DESFIRE_EV3, DESFIRE_EV3,
DESFIRE_LIGHT, DESFIRE_LIGHT,
PLUS_EV1, PLUS_EV1,
PLUS_EV2,
NTAG413DNA, NTAG413DNA,
} nxp_cardtype_t; } nxp_cardtype_t;
@ -300,6 +301,8 @@ static nxp_cardtype_t getCardType(uint8_t major, uint8_t minor) {
return DESFIRE_LIGHT; return DESFIRE_LIGHT;
if (major == 0x11 && minor == 0x00) if (major == 0x11 && minor == 0x00)
return PLUS_EV1; return PLUS_EV1;
if (major == 0x22 && minor == 0x00)
return PLUS_EV2;
if (major == 0x10 && minor == 0x00) if (major == 0x10 && minor == 0x00)
return NTAG413DNA; return NTAG413DNA;
return DESFIRE_UNKNOWN; return DESFIRE_UNKNOWN;
@ -663,6 +666,12 @@ static int CmdHF14ADesInfo(const char *Cmd) {
DropField(); DropField();
return PM3_SUCCESS; return PM3_SUCCESS;
} }
if (cardtype == PLUS_EV2) {
PrintAndLogEx(INFO, "Card seems to be MIFARE Plus EV2. Try " _YELLOW_("`hf mfp info`"));
DropField();
return PM3_SUCCESS;
}
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "---------------------------------- " _CYAN_("Tag Information") " ----------------------------------"); PrintAndLogEx(INFO, "---------------------------------- " _CYAN_("Tag Information") " ----------------------------------");

7
client/src/cmdhfmfp.c
View file

@ -155,6 +155,9 @@ static nxp_cardtype_t getCardType(uint8_t major, uint8_t minor) {
if (major == 0x11 && minor == 0x00) if (major == 0x11 && minor == 0x00)
return PLUS_EV1; return PLUS_EV1;
if (major == 0x22 && minor == 0x00)
return PLUS_EV2;
return MFP_UNKNOWN; return MFP_UNKNOWN;
} }
@ -343,11 +346,11 @@ static int CmdHFMFPInfo(const char *Cmd) {
uint16_t ATQA = card.atqa[0] + (card.atqa[1] << 8); uint16_t ATQA = card.atqa[0] + (card.atqa[1] << 8);
if (ATQA & 0x0004) { if (ATQA & 0x0004) {
PrintAndLogEx(INFO, " Size...... " _GREEN_("2K") " (%s UID)", (ATQA & 0x0040) ? "7" : "4"); PrintAndLogEx(INFO, " Size....... " _GREEN_("2K") " (%s UID)", (ATQA & 0x0040) ? "7" : "4");
isPlus = true; isPlus = true;
} }
if (ATQA & 0x0002) { if (ATQA & 0x0002) {
PrintAndLogEx(INFO, " Size...... " _GREEN_("4K") " (%s UID)", (ATQA & 0x0040) ? "7" : "4"); PrintAndLogEx(INFO, " Size....... " _GREEN_("4K") " (%s UID)", (ATQA & 0x0040) ? "7" : "4");
isPlus = true; isPlus = true;
} }

1
client/src/cmdhfmfp.h
View file

@ -28,6 +28,7 @@ typedef enum {
DESFIRE_EV3, DESFIRE_EV3,
DESFIRE_LIGHT, DESFIRE_LIGHT,
PLUS_EV1, PLUS_EV1,
PLUS_EV2,
} nxp_cardtype_t; } nxp_cardtype_t;
typedef struct mfp_key_item { typedef struct mfp_key_item {