FIX: 'lf presco' demod fixes.

[proxmark3-svn] / client / cmdhfmfu.h

diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 132e4f9086b1431711cdff020b33dbf65b6c6fb9..04449ee25da2b3bbb778c9df28c6ed2fa4f29d7e 100644 (file)
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -9,22 +9,43 @@ int CmdHF14AMfURdBl(const char *Cmd);
 
 //Crypto Cards
 int CmdHF14AMfucAuth(const char *Cmd);
 
 //Crypto Cards
 int CmdHF14AMfucAuth(const char *Cmd);

+int CmdHF14AMfucSetPwd(const char *Cmd);
+int CmdHF14AMfucSetUid(const char *Cmd);
+int CmdHF14AMfuGenDiverseKeys(const char *Cmd);
+int CmdHF14AMfuPwdGen(const char *Cmd);

 
 //general stuff
 int CmdHF14AMfUDump(const char *Cmd);
 int CmdHF14AMfUInfo(const char *Cmd);
 
 //general stuff
 int CmdHF14AMfUDump(const char *Cmd);
 int CmdHF14AMfUInfo(const char *Cmd);

+int CmdHF14AMfUeLoad(const char *Cmd);
+int CmdHF14AMfUSim(const char *Cmd);

 
 uint32_t GetHF14AMfU_Type(void);
 int ul_print_type(uint32_t tagtype, uint8_t spacer);
 void ul_switch_off_field(void);
 
 
 uint32_t GetHF14AMfU_Type(void);
 int ul_print_type(uint32_t tagtype, uint8_t spacer);
 void ul_switch_off_field(void);
 

-int usage_hf_mfu_dump(void);

 int usage_hf_mfu_info(void);
 int usage_hf_mfu_info(void);

+int usage_hf_mfu_dump(void);

 int usage_hf_mfu_rdbl(void);
 int usage_hf_mfu_wrbl(void);
 int usage_hf_mfu_rdbl(void);
 int usage_hf_mfu_wrbl(void);

+int usage_hf_mfu_eload(void);
+int usage_hf_mfu_sim(void);
+int usage_hf_mfu_ucauth(void);
+int usage_hf_mfu_ucsetpwd(void);
+int usage_hf_mfu_ucsetuid(void);
+int usage_hf_mfu_gendiverse(void);
+int  usage_hf_mfu_pwdgen(void);

 
 int CmdHFMFUltra(const char *Cmd);
 
 
 int CmdHFMFUltra(const char *Cmd);
 

+uint32_t ul_ev1_pwdgenA(uint8_t* uid);
+uint32_t ul_ev1_pwdgenA(uint8_t* uid);
+uint32_t ul_ev1_pwdgenC(uint8_t* uid);
+
+uint16_t ul_ev1_packgenA(uint8_t* uid);
+uint16_t ul_ev1_packgenA(uint8_t* uid);
+uint16_t ul_ev1_packgenA(uint8_t* uid);
+

 typedef enum TAGTYPE_UL {
        UNKNOWN       = 0x000000,
        UL            = 0x000001,
 typedef enum TAGTYPE_UL {
        UNKNOWN       = 0x000000,
        UL            = 0x000001,


@@ -45,7 +66,8 @@ typedef enum TAGTYPE_UL {
        MY_D_MOVE_LEAN= 0x008000,
        NTAG_I2C_1K   = 0x010000,
        NTAG_I2C_2K   = 0x020000,
        MY_D_MOVE_LEAN= 0x008000,
        NTAG_I2C_1K   = 0x010000,
        NTAG_I2C_2K   = 0x020000,

-       MAGIC         = 0x040000,
+       FUDAN_UL      = 0x040000,
+       MAGIC         = 0x080000,

        UL_MAGIC      = UL | MAGIC,
        UL_C_MAGIC    = UL_C | MAGIC,
        UL_ERROR      = 0xFFFFFF,
        UL_MAGIC      = UL | MAGIC,
        UL_C_MAGIC    = UL_C | MAGIC,
        UL_ERROR      = 0xFFFFFF,