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

ADD: NTAG_210, NTAG_212 support / identification. @marshmellow42 's idea.

Browse source
This commit is contained in:
iceman1001 2015-05-20 14:09:40 +02:00
commit b61e397962
2 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/cmdhfmfu.c
View file

@ -20,6 +20,9 @@
#define MAX_ULC_BLOCKS 0x2b #define MAX_ULC_BLOCKS 0x2b
#define MAX_ULEV1a_BLOCKS 0x12 #define MAX_ULEV1a_BLOCKS 0x12
#define MAX_ULEV1b_BLOCKS 0x20 #define MAX_ULEV1b_BLOCKS 0x20
#define MAX_NTAG_203 0x2c
#define MAX_NTAG_210 0x13
#define MAX_NTAG_212 0x28
#define MAX_NTAG_213 0x2c #define MAX_NTAG_213 0x2c
#define MAX_NTAG_215 0x86 #define MAX_NTAG_215 0x86
#define MAX_NTAG_216 0xe6 #define MAX_NTAG_216 0xe6
@ -51,12 +54,15 @@ uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
{0x32,0x0C,0x16,0x17}, // PACK 0x80,0x80 -- AMiiboo (sniffed) {0x32,0x0C,0x16,0x17}, // PACK 0x80,0x80 -- AMiiboo (sniffed)
}; };
#define MAX_UL_TYPES 13 #define MAX_UL_TYPES 16
uint16_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {UNKNOWN, UL, UL_C, UL_EV1_48, UL_EV1_128, uint16_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {UNKNOWN, UL, UL_C, UL_EV1_48, UL_EV1_128,
NTAG, NTAG_213, NTAG_215, NTAG_216, MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC}; NTAG, NTAG_203, NTAG_210, NTAG_212, NTAG_213, NTAG_215, NTAG_216,
uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS, MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC};
MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_213, MAX_NTAG_213, MAX_NTAG_215, uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {
MAX_NTAG_216, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS}; MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS,
MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS,
MAX_NTAG_213, MAX_NTAG_203, MAX_NTAG_210, MAX_NTAG_212, MAX_NTAG_213, MAX_NTAG_215, MAX_NTAG_216,
MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_UL_BLOCKS};
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
@ -333,6 +339,10 @@ int ul_print_type(uint16_t tagtype, uint8_t spaces){
PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer); PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer);
else if ( tagtype & NTAG_203 ) else if ( tagtype & NTAG_203 )
PrintAndLog("%sTYPE : NTAG 203 144bytes (NT2H0301G0DU)", spacer); PrintAndLog("%sTYPE : NTAG 203 144bytes (NT2H0301G0DU)", spacer);
else if ( tagtype & NTAG_210 )
PrintAndLog("%sTYPE : NTAG 210 48bytes (NT2L1011G0DU)", spacer);
else if ( tagtype & NTAG_212 )
PrintAndLog("%sTYPE : NTAG 212 1284bytes (NT2L1011G0DU)", spacer);
else if ( tagtype & NTAG_213 ) else if ( tagtype & NTAG_213 )
PrintAndLog("%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer); PrintAndLog("%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer);
else if ( tagtype & NTAG_215 ) else if ( tagtype & NTAG_215 )
@ -531,6 +541,10 @@ uint16_t GetHF14AMfU_Type(void){
tagtype = UL_EV1_48; tagtype = UL_EV1_48;
else if ( version[2] == 0x03 && version[6] != 0x0B ) else if ( version[2] == 0x03 && version[6] != 0x0B )
tagtype = UL_EV1_128; tagtype = UL_EV1_128;
else if ( version[2] == 0x04 && version[6] == 0x0B )
tagtype = NTAG_210;
else if ( version[2] == 0x04 && version[6] == 0x0E )
tagtype = NTAG_212;
else if ( version[2] == 0x04 && version[6] == 0x0F ) else if ( version[2] == 0x04 && version[6] == 0x0F )
tagtype = NTAG_213; tagtype = NTAG_213;
else if ( version[2] == 0x04 && version[6] == 0x11 ) else if ( version[2] == 0x04 && version[6] == 0x11 )
@ -749,7 +763,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
ulev1_print_configuration(ulev1_conf); ulev1_print_configuration(ulev1_conf);
} }
if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216))) { if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_210 | NTAG_212 | NTAG_213 | NTAG_215 | NTAG_216))) {
uint8_t version[10] = {0x00}; uint8_t version[10] = {0x00};
status = ulev1_getVersion(version, sizeof(version)); status = ulev1_getVersion(version, sizeof(version));

18
client/cmdhfmfu.h
View file

@ -35,14 +35,16 @@ typedef enum TAGTYPE_UL {
UL_EV1_128 = 0x0008, UL_EV1_128 = 0x0008,
NTAG = 0x0010, NTAG = 0x0010,
NTAG_203 = 0x0020, NTAG_203 = 0x0020,
NTAG_213 = 0x0020, NTAG_210 = 0x0040,
NTAG_215 = 0x0080, NTAG_212 = 0x0080,
NTAG_216 = 0x0100, NTAG_213 = 0x0100,
MY_D = 0x0200, NTAG_215 = 0x0200,
MY_D_NFC = 0x0400, NTAG_216 = 0x0400,
MY_D_MOVE = 0x0800, MY_D = 0x0800,
MY_D_MOVE_NFC = 0x1000, MY_D_NFC = 0x1000,
MAGIC = 0x2000, MY_D_MOVE = 0x2000,
MY_D_MOVE_NFC = 0x4000,
MAGIC = 0x8000,
UL_MAGIC = UL | MAGIC, UL_MAGIC = UL | MAGIC,
UL_C_MAGIC = UL_C | MAGIC, UL_C_MAGIC = UL_C | MAGIC,
UL_ERROR = 0xFFFF, UL_ERROR = 0xFFFF,