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

feat: Add detection method info to Gen 2 / CUID magic card display

Browse source
This commit is contained in:
火山大隊長 2025-07-05 03:29:40 +08:00
commit 3add3ebee2
3 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
armsrc/mifarecmd.c
View file

@ -3033,31 +3033,31 @@ void MifareCIdent(bool is_mfc, uint8_t keytype, uint8_t *key) {
if (memcmp(card->ats, "\x09\x78\x00\x91\x02\xDA\xBC\x19\x10", 9) == 0) { if (memcmp(card->ats, "\x09\x78\x00\x91\x02\xDA\xBC\x19\x10", 9) == 0) {
// test for some MFC gen2 // test for some MFC gen2
isGen2 = true; isGen2 = true;
flag |= MAGIC_FLAG_GEN_2; flag |= MAGIC_FLAG_GEN_2_ATS;
} else if (memcmp(card->ats, "\x0D\x78\x00\x71\x02\x88\x49\xA1\x30\x20\x15\x06\x08\x56\x3D", 15) == 0) { } else if (memcmp(card->ats, "\x0D\x78\x00\x71\x02\x88\x49\xA1\x30\x20\x15\x06\x08\x56\x3D", 15) == 0) {
// test for some MFC 7b gen2 // test for some MFC 7b gen2
isGen2 = true; isGen2 = true;
flag |= MAGIC_FLAG_GEN_2; flag |= MAGIC_FLAG_GEN_2_ATS;
} else if (memcmp(card->ats, "\x0A\x78\x00\x81\x02\xDB\xA0\xC1\x19\x40\x2A\xB5", 12) == 0) { } else if (memcmp(card->ats, "\x0A\x78\x00\x81\x02\xDB\xA0\xC1\x19\x40\x2A\xB5", 12) == 0) {
// test for Ultralight magic gen2 // test for Ultralight magic gen2
isGen2 = true; isGen2 = true;
flag |= MAGIC_FLAG_GEN_2; flag |= MAGIC_FLAG_GEN_2_ATS;
} else if (memcmp(card->ats, "\x85\x00\x00\xA0\x00\x00\x0A\xC3\x00\x04\x03\x01\x01\x00\x0B\x03\x41\xDF", 18) == 0) { } else if (memcmp(card->ats, "\x85\x00\x00\xA0\x00\x00\x0A\xC3\x00\x04\x03\x01\x01\x00\x0B\x03\x41\xDF", 18) == 0) {
// test for Ultralight EV1 magic gen2 // test for Ultralight EV1 magic gen2
isGen2 = true; isGen2 = true;
flag |= MAGIC_FLAG_GEN_2; flag |= MAGIC_FLAG_GEN_2_ATS;
} else if (memcmp(card->ats, "\x85\x00\x00\xA0\x0A\x00\x0A\xC3\x00\x04\x03\x01\x01\x00\x0B\x03\x16\xD7", 18) == 0) { } else if (memcmp(card->ats, "\x85\x00\x00\xA0\x0A\x00\x0A\xC3\x00\x04\x03\x01\x01\x00\x0B\x03\x16\xD7", 18) == 0) {
// test for some other Ultralight EV1 magic gen2 // test for some other Ultralight EV1 magic gen2
isGen2 = true; isGen2 = true;
flag |= MAGIC_FLAG_GEN_2; flag |= MAGIC_FLAG_GEN_2_ATS;
} else if (memcmp(card->ats, "\x85\x00\x00\xA0\x0A\x00\x0A\xB0\x00\x00\x00\x00\x00\x00\x00\x00\x18\x4D", 18) == 0) { } else if (memcmp(card->ats, "\x85\x00\x00\xA0\x0A\x00\x0A\xB0\x00\x00\x00\x00\x00\x00\x00\x00\x18\x4D", 18) == 0) {
// test for some other Ultralight magic gen2 // test for some other Ultralight magic gen2
isGen2 = true; isGen2 = true;
flag |= MAGIC_FLAG_GEN_2; flag |= MAGIC_FLAG_GEN_2_ATS;
} else if (memcmp(card->ats, "\x85\x00\x00\xA0\x00\x00\x0A\xA5\x00\x04\x04\x02\x01\x00\x0F\x03\x79\x0C", 18) == 0) { } else if (memcmp(card->ats, "\x85\x00\x00\xA0\x00\x00\x0A\xA5\x00\x04\x04\x02\x01\x00\x0F\x03\x79\x0C", 18) == 0) {
// test for NTAG213 magic gen2 // test for NTAG213 magic gen2
isGen2 = true; isGen2 = true;
flag |= MAGIC_FLAG_GEN_2; flag |= MAGIC_FLAG_GEN_2_ATS;
} }
// test for super card // test for super card
@ -3114,7 +3114,7 @@ void MifareCIdent(bool is_mfc, uint8_t keytype, uint8_t *key) {
if (mifare_classic_authex(pcs, cuid, 0, keytype, tmpkey, AUTH_FIRST, NULL, NULL) == 0) { if (mifare_classic_authex(pcs, cuid, 0, keytype, tmpkey, AUTH_FIRST, NULL, NULL) == 0) {
if ((mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_WRITEBLOCK, 0, buf, PM3_CMD_DATA_SIZE, par, NULL) == 1) && (buf[0] == 0x0A)) { if ((mifare_sendcmd_short(pcs, 1, ISO14443A_CMD_WRITEBLOCK, 0, buf, PM3_CMD_DATA_SIZE, par, NULL) == 1) && (buf[0] == 0x0A)) {
flag |= MAGIC_FLAG_GEN_2; flag |= MAGIC_FLAG_GEN_2_INVASIVE;
// turn off immediately to ensure nothing ever accidentally writes to the block // turn off immediately to ensure nothing ever accidentally writes to the block
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
} }

12
client/src/mifare/mifarehost.c
View file

@ -1677,8 +1677,16 @@ uint16_t detect_mf_magic(bool is_mfc, uint8_t key_type, uint64_t key) {
PrintAndLogEx(SUCCESS, "Magic capabilities... " _GREEN_("Gen 1b")); PrintAndLogEx(SUCCESS, "Magic capabilities... " _GREEN_("Gen 1b"));
} }
if ((isMagic & MAGIC_FLAG_GEN_2) == MAGIC_FLAG_GEN_2) { if ((isMagic & MAGIC_FLAG_GEN_2) == MAGIC_FLAG_GEN_2) { // deprecated
PrintAndLogEx(SUCCESS, "Magic capabilities... " _GREEN_("Gen 2 / CUID")); PrintAndLogEx(SUCCESS, "Magic capabilities... " _GREEN_("Gen 2 / CUID")); // deprecated
} // deprecated
if ((isMagic & MAGIC_FLAG_GEN_2_ATS) == MAGIC_FLAG_GEN_2_ATS) {
PrintAndLogEx(SUCCESS, "Magic capabilities... " _GREEN_("Gen 2 / CUID") " ( detected via ATS signature )");
}
if ((isMagic & MAGIC_FLAG_GEN_2_INVASIVE) == MAGIC_FLAG_GEN_2_INVASIVE) {
PrintAndLogEx(SUCCESS, "Magic capabilities... " _GREEN_("Gen 2 / CUID") " ( detected via invasive test )");
} }
if ((isMagic & MAGIC_FLAG_GEN_3) == MAGIC_FLAG_GEN_3) { if ((isMagic & MAGIC_FLAG_GEN_3) == MAGIC_FLAG_GEN_3) {

4
include/protocols.h
View file

@ -272,7 +272,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
#define MAGIC_FLAG_NONE 0x0000 #define MAGIC_FLAG_NONE 0x0000
#define MAGIC_FLAG_GEN_1A 0x0001 #define MAGIC_FLAG_GEN_1A 0x0001
#define MAGIC_FLAG_GEN_1B 0x0002 #define MAGIC_FLAG_GEN_1B 0x0002
#define MAGIC_FLAG_GEN_2 0x0004 #define MAGIC_FLAG_GEN_2_ATS 0x0004 // Gen 2 detected via ATS signature
#define MAGIC_FLAG_GEN_UNFUSED 0x0008 #define MAGIC_FLAG_GEN_UNFUSED 0x0008
#define MAGIC_FLAG_SUPER_GEN1 0x0010 #define MAGIC_FLAG_SUPER_GEN1 0x0010
#define MAGIC_FLAG_SUPER_GEN2 0x0020 #define MAGIC_FLAG_SUPER_GEN2 0x0020
@ -284,7 +284,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
#define MAGIC_FLAG_GDM_WUP_20 0x0800 #define MAGIC_FLAG_GDM_WUP_20 0x0800
#define MAGIC_FLAG_GDM_WUP_40 0x1000 #define MAGIC_FLAG_GDM_WUP_40 0x1000
#define MAGIC_FLAG_GDM_WUP_40_ZUID 0x2000 #define MAGIC_FLAG_GDM_WUP_40_ZUID 0x2000
#define MAGIC_FLAG_GEN_2_INVASIVE 0x4000 // Gen 2 detected via invasive test
// Commands for configuration of Gen4 GTU cards. // Commands for configuration of Gen4 GTU cards.
// see https://github.com/RfidResearchGroup/proxmark3/blob/master/doc/magic_cards_notes.md // see https://github.com/RfidResearchGroup/proxmark3/blob/master/doc/magic_cards_notes.md