From 593fc3c9a334aec3a21d289cec9c8f760239c058 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Tue, 19 May 2015 21:45:06 +0200 Subject: [PATCH] FIX: comment out a #include to reveng (my experiment) ADD: Started to add a NTAG203 identification. Its a hard tag to pinpoint. Doesn't have GET_VERSION, --- client/cmdcrc.c | 2 +- client/cmdhfmfu.c | 11 ++++++++--- client/cmdhfmfu.h | 15 ++++++++------- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/client/cmdcrc.c b/client/cmdcrc.c index 895f360c..6191027f 100644 --- a/client/cmdcrc.c +++ b/client/cmdcrc.c @@ -13,7 +13,7 @@ #include "cmdparser.h" #include "cmdcrc.h" //#include "reveng/reveng.h" -#include "reveng/cli.h" +//#include "reveng/cli.h" static int CmdHelp(const char *Cmd); int CmdCrcCalc(const char *Cmd) diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c index efeda8b9..69f2fe44 100644 --- a/client/cmdhfmfu.c +++ b/client/cmdhfmfu.c @@ -331,12 +331,14 @@ int ul_print_type(uint16_t tagtype, uint8_t spaces){ PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); else if ( tagtype & UL_EV1_128) PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer); + else if ( tagtype & NTAG_203 ) + PrintAndLog("%sTYPE : NTAG 203 144bytes (NT2H0301G0DU)", spacer); else if ( tagtype & NTAG_213 ) - PrintAndLog("%sTYPE : MIFARE NTAG 213 144bytes (NT2H1311G0DU)", spacer); + PrintAndLog("%sTYPE : NTAG 213 144bytes (NT2H1311G0DU)", spacer); else if ( tagtype & NTAG_215 ) - PrintAndLog("%sTYPE : MIFARE NTAG 215 504bytes (NT2H1511G0DU)", spacer); + PrintAndLog("%sTYPE : NTAG 215 504bytes (NT2H1511G0DU)", spacer); else if ( tagtype & NTAG_216 ) - PrintAndLog("%sTYPE : MIFARE NTAG 216 888bytes (NT2H1611G0DU)", spacer); + PrintAndLog("%sTYPE : NTAG 216 888bytes (NT2H1611G0DU)", spacer); else if ( tagtype & MY_D ) PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer); else if ( tagtype & MY_D_NFC ) @@ -559,6 +561,9 @@ uint16_t GetHF14AMfU_Type(void){ ul_switch_off_field(); } + + //NTAG203 detection here. + } else { // Infinition MY-D tests Exam high nibble uint8_t nib = (card.uid[1] & 0xf0) >> 4; diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h index 9773b246..23bc950a 100644 --- a/client/cmdhfmfu.h +++ b/client/cmdhfmfu.h @@ -34,14 +34,15 @@ typedef enum TAGTYPE_UL { UL_EV1_48 = 0x0004, UL_EV1_128 = 0x0008, NTAG = 0x0010, + NTAG_203 = 0x0020, NTAG_213 = 0x0020, - NTAG_215 = 0x0040, - NTAG_216 = 0x0080, - MY_D = 0x0100, - MY_D_NFC = 0x0200, - MY_D_MOVE = 0x0400, - MY_D_MOVE_NFC = 0x0800, - MAGIC = 0x1000, + NTAG_215 = 0x0080, + NTAG_216 = 0x0100, + MY_D = 0x0200, + MY_D_NFC = 0x0400, + MY_D_MOVE = 0x0800, + MY_D_MOVE_NFC = 0x1000, + MAGIC = 0x2000, UL_MAGIC = UL | MAGIC, UL_C_MAGIC = UL_C | MAGIC, UL_ERROR = 0xFFFF, -- 2.39.2