ADD: `analyse nuid` - generates NUID 4byte from a UID 7byte. Mifare Classic Ev1...

[proxmark3-svn] / client / cmdhfmfu.h

diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 9da0bb539a41eb8c89829b30e8c943809ff1030f..04449ee25da2b3bbb778c9df28c6ed2fa4f29d7e 100644 (file)
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -4,28 +4,48 @@
 #ifndef CMDHFMFU_H__
 #define CMDHFMFU_H__
 
 #ifndef CMDHFMFU_H__
 #define CMDHFMFU_H__
 

-//standard ultralight

 int CmdHF14AMfUWrBl(const char *Cmd);
 int CmdHF14AMfURdBl(const char *Cmd);
 
 //Crypto Cards
 int CmdHF14AMfUWrBl(const char *Cmd);
 int CmdHF14AMfURdBl(const char *Cmd);
 
 //Crypto Cards

-int CmdHF14AMfUCRdBl(const char *Cmd);
-int CmdHF14AMfUCRdCard(const char *Cmd);

 int CmdHF14AMfucAuth(const char *Cmd);
 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);

-uint32_t GetHF14AMfU_Type(void);
+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);
 
 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_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,


@@ -33,9 +53,9 @@ typedef enum TAGTYPE_UL {
        UL_EV1_48     = 0x000004,
        UL_EV1_128    = 0x000008,
        NTAG          = 0x000010,
        UL_EV1_48     = 0x000004,
        UL_EV1_128    = 0x000008,
        NTAG          = 0x000010,

-       NTAG_203          = 0x000020,
-       NTAG_210          = 0x000040,
-       NTAG_212          = 0x000080,
+       NTAG_203      = 0x000020,
+       NTAG_210      = 0x000040,
+       NTAG_212      = 0x000080,

        NTAG_213      = 0x000100,
        NTAG_215      = 0x000200,
        NTAG_216      = 0x000400,
        NTAG_213      = 0x000100,
        NTAG_215      = 0x000200,
        NTAG_216      = 0x000400,


@@ -43,9 +63,11 @@ typedef enum TAGTYPE_UL {
        MY_D_NFC      = 0x001000,
        MY_D_MOVE     = 0x002000,
        MY_D_MOVE_NFC = 0x004000,
        MY_D_NFC      = 0x001000,
        MY_D_MOVE     = 0x002000,
        MY_D_MOVE_NFC = 0x004000,

-       NTAG_I2C_1K       = 0x008000,
-       NTAG_I2C_2K       = 0x010000,
-       MAGIC         = 0x020000,
+       MY_D_MOVE_LEAN= 0x008000,
+       NTAG_I2C_1K   = 0x010000,
+       NTAG_I2C_2K   = 0x020000,
+       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,