dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHG: 'hf mfu' gettype identification, now deals with NTAG213, GetVersion = subtype 04,

Browse Source
This commit is contained in:
iceman1001
2017-11-26 19:16:12 +01:00
parent 1ebf4afd73
commit 428e54bb6b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/cmdhfmfu.c
View File

@@ -742,19 +742,22 @@ uint32_t GetHF14AMfU_Type(void){
switch (len) { switch (len) {
case 0x0A: { case 0x0A: {
if ( version[2] == 0x03 && version[6] == 0x0B ) #define PTYPE 2
#define PSUBTYPE 3
#define PSIZE 6
if ( version[PTYPE] == 0x03 && version[PSIZE] == 0x0B )
tagtype = UL_EV1_48; tagtype = UL_EV1_48;
else if ( version[2] == 0x03 && version[6] != 0x0B ) else if ( version[PTYPE] == 0x03 && version[PSIZE] != 0x0B )
tagtype = UL_EV1_128; tagtype = UL_EV1_128;
else if ( version[2] == 0x04 && version[3] == 0x01 && version[6] == 0x0B ) else if ( version[PTYPE] == 0x04 && version[PSUBTYPE] == 0x01 && version[PSIZE] == 0x0B )
tagtype = NTAG_210; tagtype = NTAG_210;
else if ( version[2] == 0x04 && version[3] == 0x01 && version[6] == 0x0E ) else if ( version[PTYPE] == 0x04 && version[PSUBTYPE] == 0x01 && version[PSIZE] == 0x0E )
tagtype = NTAG_212; tagtype = NTAG_212;
else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x0F ) else if ( version[PTYPE] == 0x04 && (version[PSUBTYPE] == 0x02 || version[PSUBTYPE] == 0x04) && version[PSIZE] == 0x0F )
tagtype = NTAG_213; tagtype = NTAG_213;
else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x11 ) else if ( version[PTYPE] == 0x04 && version[PSUBTYPE] == 0x02 && version[PSIZE] == 0x11 )
tagtype = NTAG_215; tagtype = NTAG_215;
else if ( version[2] == 0x04 && version[3] == 0x02 && version[6] == 0x13 ) else if ( version[PTYPE] == 0x04 && version[PSUBTYPE] == 0x02 && version[PSIZE] == 0x13 )
tagtype = NTAG_216; tagtype = NTAG_216;
else if ( memcmp(version+2, "\x04\x05\x02\x01\x13", 5) == 0) else if ( memcmp(version+2, "\x04\x05\x02\x01\x13", 5) == 0)
tagtype = NTAG_I2C_1K; tagtype = NTAG_I2C_1K;
@@ -764,7 +767,7 @@ uint32_t GetHF14AMfU_Type(void){
tagtype = NTAG_I2C_1K_PLUS; tagtype = NTAG_I2C_1K_PLUS;
else if ( memcmp(version+2, "\x04\x05\x02\x02\x15", 5) == 0) else if ( memcmp(version+2, "\x04\x05\x02\x02\x15", 5) == 0)
tagtype = NTAG_I2C_2K_PLUS; tagtype = NTAG_I2C_2K_PLUS;
else if ( version[2] == 0x04 ) else if ( version[PTYPE] == 0x04 )
tagtype = NTAG; tagtype = NTAG;
break; break;