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

Fixes to DESFire product type recognition

Browse source
This commit is contained in:
kormax 2025-02-17 19:52:07 +02:00
commit 23dda08962
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/cmdhfmfdes.c
View file

@ -355,6 +355,10 @@ static nxp_cardtype_t getCardType(uint8_t type, uint8_t major, uint8_t minor) {
if (type == 0x81 && major == 0x42 && minor == 0x00) if (type == 0x81 && major == 0x42 && minor == 0x00)
return DESFIRE_EV2; return DESFIRE_EV2;
// Apple Wallet DESFire Applet
if (type == 0x91 && major == 0x62 && minor == 0x01)
return DESFIRE_EV2;
// Plus EV1 // Plus EV1
if (type == 0x02 && major == 0x11 && minor == 0x00) if (type == 0x02 && major == 0x11 && minor == 0x00)
return PLUS_EV1; return PLUS_EV1;
@ -377,7 +381,7 @@ static nxp_cardtype_t getCardType(uint8_t type, uint8_t major, uint8_t minor) {
// ref: https://www.nxp.com/docs/en/application-note/AN12343.pdf p7 // ref: https://www.nxp.com/docs/en/application-note/AN12343.pdf p7
static nxp_producttype_t getProductType(const uint8_t *versionhw) { static nxp_producttype_t getProductType(const uint8_t *versionhw) {
uint8_t product = versionhw[2]; uint8_t product = versionhw[1];
if (product == 0x01) if (product == 0x01)
return DESFIRE_PHYSICAL; return DESFIRE_PHYSICAL;
@ -394,7 +398,7 @@ static nxp_producttype_t getProductType(const uint8_t *versionhw) {
static const char *getProductTypeStr(const uint8_t *versionhw) { static const char *getProductTypeStr(const uint8_t *versionhw) {
uint8_t product = versionhw[2]; uint8_t product = versionhw[1];
if (product == 0x01) if (product == 0x01)
return "MIFARE DESFire native IC (physical card)"; return "MIFARE DESFire native IC (physical card)";