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

FIX: comment out a #include to reveng (my experiment)

Browse source 
ADD: Started to add a NTAG203 identification.   Its a hard tag to pinpoint. Doesn't have GET_VERSION,
This commit is contained in:
iceman1001 2015-05-19 21:45:06 +02:00
commit 593fc3c9a3
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmdcrc.c
View file

@ -13,7 +13,7 @@
#include "cmdparser.h" #include "cmdparser.h"
#include "cmdcrc.h" #include "cmdcrc.h"
//#include "reveng/reveng.h" //#include "reveng/reveng.h"
#include "reveng/cli.h" //#include "reveng/cli.h"
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
int CmdCrcCalc(const char *Cmd) int CmdCrcCalc(const char *Cmd)

11
client/cmdhfmfu.c
View file

@ -331,12 +331,14 @@ int ul_print_type(uint16_t tagtype, uint8_t spaces){
PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer); PrintAndLog("%sTYPE : MIFARE Ultralight EV1 48bytes (MF0UL1101)", spacer);
else if ( tagtype & UL_EV1_128) else if ( tagtype & UL_EV1_128)
PrintAndLog("%sTYPE : MIFARE Ultralight EV1 128bytes (MF0UL2101)", spacer); 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 ) 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 ) 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 ) 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 ) else if ( tagtype & MY_D )
PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer); PrintAndLog("%sTYPE : INFINEON my-d\x99", spacer);
else if ( tagtype & MY_D_NFC ) else if ( tagtype & MY_D_NFC )
@ -559,6 +561,9 @@ uint16_t GetHF14AMfU_Type(void){
ul_switch_off_field(); ul_switch_off_field();
} }
//NTAG203 detection here.
} else { } else {
// Infinition MY-D tests Exam high nibble // Infinition MY-D tests Exam high nibble
uint8_t nib = (card.uid[1] & 0xf0) >> 4; uint8_t nib = (card.uid[1] & 0xf0) >> 4;

15
client/cmdhfmfu.h
View file

@ -34,14 +34,15 @@ typedef enum TAGTYPE_UL {
UL_EV1_48 = 0x0004, UL_EV1_48 = 0x0004,
UL_EV1_128 = 0x0008, UL_EV1_128 = 0x0008,
NTAG = 0x0010, NTAG = 0x0010,
NTAG_203 = 0x0020,
NTAG_213 = 0x0020, NTAG_213 = 0x0020,
NTAG_215 = 0x0040, NTAG_215 = 0x0080,
NTAG_216 = 0x0080, NTAG_216 = 0x0100,
MY_D = 0x0100, MY_D = 0x0200,
MY_D_NFC = 0x0200, MY_D_NFC = 0x0400,
MY_D_MOVE = 0x0400, MY_D_MOVE = 0x0800,
MY_D_MOVE_NFC = 0x0800, MY_D_MOVE_NFC = 0x1000,
MAGIC = 0x1000, MAGIC = 0x2000,
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,