minor code clean up

[proxmark3-svn] / client / cmdhfmfu.h

diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 20f25d1db950743f703fc5f2d6e7706841eed3af..ce38f26a076644a5139d0ec3f56fae2d04965b21 100644 (file)
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -1,16 +1,53 @@
 #include "cmdhfmf.h"
 #include "cmdhfmf.h"

+#include "cmdhf14a.h"
+
+#ifndef CMDHFMFU_H__
+#define CMDHFMFU_H__

 
 //standard ultralight
 int CmdHF14AMfUWrBl(const char *Cmd);
 int CmdHF14AMfURdBl(const char *Cmd);
 
 //standard ultralight
 int CmdHF14AMfUWrBl(const char *Cmd);
 int CmdHF14AMfURdBl(const char *Cmd);

-int CmdHF14AMfURdCard(const char *Cmd);
-int CmdHF14AMfUDump(const char *Cmd);
+

 //Crypto Cards
 int CmdHF14AMfUCRdBl(const char *Cmd);
 int CmdHF14AMfUCRdCard(const char *Cmd);
 //Crypto Cards
 int CmdHF14AMfUCRdBl(const char *Cmd);
 int CmdHF14AMfUCRdCard(const char *Cmd);

-int CmdHF14AMfUCDump(const char *Cmd);

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

-void rol (uint8_t *data, const size_t len);
+
+uint8_t requestAuthentication(uint8_t *nonce);
+int try3DesAuthentication(uint8_t *key);

 
 //general stuff
 
 //general stuff

+int CmdHF14AMfUInfo(const char *Cmd);
+int CmdHF14AMfUDump(const char *Cmd);
+uint16_t GetHF14AMfU_Type(void);
+
+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 CmdHFMFUltra(const char *Cmd);
 int CmdHFMFUltra(const char *Cmd);

+
+typedef enum TAGTYPE_UL {
+       UNKNOWN       = 0x0000,
+       UL            = 0x0001,
+       UL_C          = 0x0002,
+       UL_EV1_48     = 0x0004,
+       UL_EV1_128    = 0x0008,
+       NTAG          = 0x0010,
+       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,
+       UL_MAGIC      = UL | MAGIC,
+       UL_C_MAGIC    = UL_C | MAGIC,
+       UL_ERROR      = 0xFFFF,
+} TagTypeUL_t;
+
+#endif