X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/98cdd56862f6f95b8c0192e9f582e99875f50e3f..e9bb4f47eed9e474330bb62b8e32aa654f2b63a8:/client/cmdhfmfu.h diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h index ce38f26a..23bc950a 100644 --- a/client/cmdhfmfu.h +++ b/client/cmdhfmfu.h @@ -13,20 +13,17 @@ int CmdHF14AMfUCRdBl(const char *Cmd); int CmdHF14AMfUCRdCard(const char *Cmd); int CmdHF14AMfucAuth(const char *Cmd); -uint8_t requestAuthentication(uint8_t *nonce); -int try3DesAuthentication(uint8_t *key); - //general stuff -int CmdHF14AMfUInfo(const char *Cmd); int CmdHF14AMfUDump(const char *Cmd); +int CmdHF14AMfUInfo(const char *Cmd); uint16_t GetHF14AMfU_Type(void); -void rol (uint8_t *data, const size_t len); +//void rol (uint8_t *data, const size_t len); int ul_print_type(uint16_t tagtype, uint8_t spacer); void ul_switch_off_field(void); -int usage_hf_mfu_info(void); int usage_hf_mfu_dump(void); +int usage_hf_mfu_info(void); int CmdHFMFUltra(const char *Cmd); @@ -37,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,