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

Merge pull request #2934 from ah01/ishield-key
Some checks are pending
CodeQL / Analyze (push) Waiting to run
Details
MacOS Build and Test / macos-make (push) Waiting to run
Details
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
Details
MacOS Build and Test / macos-cmake (push) Waiting to run
Details
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Details
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Details
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Details
Windows Build and Test / proxspace (push) Waiting to run
Details
Windows Build and Test / wsl (push) Waiting to run
Details

Browse source 
Add recognition of Swissbit iShield Key Mifare as MFD EV3
This commit is contained in:
Iceman 2025-07-12 12:02:50 +02:00 • committed by GitHub
commit e509967abf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
## [unreleased][unreleased] ## [unreleased][unreleased]
- Changed `hf mfdes info` - add recognition of Swissbit iShield Key Mifare (@ah01)
- Changed `hf mf info` - add detection for unknown backdoor keys and for some backdoor variants (@doegox) - Changed `hf mf info` - add detection for unknown backdoor keys and for some backdoor variants (@doegox)
- Changed `mqtt` commnands - now honors preference settings (@iceman1001) - Changed `mqtt` commnands - now honors preference settings (@iceman1001)
- Changed `prefs` - now handles MQTT settings too (@iceman1001) - Changed `prefs` - now handles MQTT settings too (@iceman1001)

7
client/src/cmdhfmfdes.c
View file

@ -238,7 +238,7 @@ static char *getProtocolStr(uint8_t id, bool hw) {
static char *getVersionStr(uint8_t type, uint8_t major, uint8_t minor) { static char *getVersionStr(uint8_t type, uint8_t major, uint8_t minor) {
static char buf[40] = {0x00}; static char buf[60] = {0x00};
char *retStr = buf; char *retStr = buf;
if (type == 0x01 && major == 0x00) if (type == 0x01 && major == 0x00)
@ -255,6 +255,8 @@ static char *getVersionStr(uint8_t type, uint8_t major, uint8_t minor) {
snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV2") " )", major, minor); snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV2") " )", major, minor);
else if (type == 0x01 && major == 0x33 && minor == 0x00) else if (type == 0x01 && major == 0x33 && minor == 0x00)
snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV3") " )", major, minor); snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV3") " )", major, minor);
else if (type == 0x81 && major == 0x43 && minor == 0x01)
snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire EV3C implementation on P71D600") " )", major, minor); // Swisskey iShield Key
else if (type == 0x01 && major == 0x30 && minor == 0x00) else if (type == 0x01 && major == 0x30 && minor == 0x00)
snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire Light") " )", major, minor); snprintf(retStr, sizeof(buf), "%x.%x ( " _GREEN_("DESFire Light") " )", major, minor);
else if (type == 0x02 && major == 0x11 && minor == 0x00) else if (type == 0x02 && major == 0x11 && minor == 0x00)
@ -329,6 +331,9 @@ nxp_cardtype_t getCardType(uint8_t type, uint8_t major, uint8_t minor) {
if (type == 0x01 && major == 0x33 && minor == 0x00) if (type == 0x01 && major == 0x33 && minor == 0x00)
return DESFIRE_EV3; return DESFIRE_EV3;
if (type == 0x81 && major == 0x43 && minor == 0x01)
return DESFIRE_EV3;
// Duox // Duox
if (type == 0x01 && major == 0xA0 && minor == 0x00) if (type == 0x01 && major == 0xA0 && minor == 0x00)
return DUOX; return DUOX;