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

Fix support for more Mifare Desfire EV2 cards

Browse source 
Was tempted to make a `major` mask with 0x0f == 1,2,3,... but...
This commit is contained in:
Benjamin DELPY 2022-02-23 23:37:47 +01:00 • committed by GitHub
commit a852f88a6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/cmdhfmfdes.c
View file

@ -247,6 +247,8 @@ static char *getVersionStr(uint8_t major, uint8_t minor) {
snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV1") " )", major, minor); snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV1") " )", major, minor);
else if (major == 0x12 && minor == 0x00) else if (major == 0x12 && minor == 0x00)
snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV2") " )", major, minor); snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV2") " )", major, minor);
else if (major == 0x22 && minor == 0x00)
snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV2") " )", major, minor);
else if (major == 0x42 && minor == 0x00) else if (major == 0x42 && minor == 0x00)
snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV2") " )", major, minor); snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV2") " )", major, minor);
else if (major == 0x33 && minor == 0x00) else if (major == 0x33 && minor == 0x00)
@ -280,11 +282,15 @@ static nxp_cardtype_t getCardType(uint8_t major, uint8_t minor) {
return DESFIRE_EV1; return DESFIRE_EV1;
if (major == 0x12 && minor == 0x00) if (major == 0x12 && minor == 0x00)
return DESFIRE_EV2; return DESFIRE_EV2;
if (major == 0x22 && minor == 0x00)
return DESFIRE_EV2;
if (major == 0x42 && minor == 0x00)
return DESFIRE_EV2;
if (major == 0x33 && minor == 0x00) if (major == 0x33 && minor == 0x00)
return DESFIRE_EV3; return DESFIRE_EV3;
if (major == 0x30 && minor == 0x00) if (major == 0x30 && minor == 0x00)
return DESFIRE_LIGHT; return DESFIRE_LIGHT;
if (major == 0x11 && minor == 0x00) if (major == 0x11 && minor == 0x00)
return PLUS_EV1; return PLUS_EV1;
if (major == 0x10 && minor == 0x00) if (major == 0x10 && minor == 0x00)
return NTAG413DNA; return NTAG413DNA;