RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-26 17:16:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

annotate new magic command (WIP)

Browse source
This commit is contained in:
iceman1001 2023-01-15 12:27:34 +01:00
parent 207d8ed7d7
commit 875b1a0aed
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/src/cmdhflist.c
View file

@ -318,6 +318,18 @@ int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool i
snprintf(exp, size, "AUTH-B(%d)", cmd[1]); snprintf(exp, size, "AUTH-B(%d)", cmd[1]);
break; break;
} }
case MIFARE_MAGIC_GDM_AUTH_KEYA:{
if (cmdsize > 3) {
snprintf(exp, size, "MAGIC AUTH-A(%d)", cmd[1]);
MifareAuthState = masNt;
}
break;
}
case MIFARE_MAGIC_GDM_AUTH_KEYB: {
MifareAuthState = masNt;
snprintf(exp, size, "MAGIC AUTH-B(%d)", cmd[1]);
break;
}
case MIFARE_MAGICWUPC1: case MIFARE_MAGICWUPC1:
snprintf(exp, size, "MAGIC WUPC1"); snprintf(exp, size, "MAGIC WUPC1");
break; break;

3
include/protocols.h
View file

@ -190,6 +190,9 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
#define MIFARE_CMD_RESTORE 0xC2 #define MIFARE_CMD_RESTORE 0xC2
#define MIFARE_CMD_TRANSFER 0xB0 #define MIFARE_CMD_TRANSFER 0xB0
#define MIFARE_MAGIC_GDM_AUTH_KEYA 0x80
#define MIFARE_MAGIC_GDM_AUTH_KEYB 0x81
#define MIFARE_EV1_PERSONAL_UID 0x40 #define MIFARE_EV1_PERSONAL_UID 0x40
#define MIFARE_EV1_SETMODE 0x43 #define MIFARE_EV1_SETMODE 0x43
#define MIFARE_EV1_UIDF0 0x00 #define MIFARE_EV1_UIDF0 0x00