X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/75465377b93c9a27450a186342e9cfd2a84b4173..a8ee668770c99f651346266a506b79192e944ab3:/client/cmdhfmfdes.h

diff --git a/client/cmdhfmfdes.h b/client/cmdhfmfdes.h
index 8ecf36d3..46e401d4 100644
--- a/client/cmdhfmfdes.h
+++ b/client/cmdhfmfdes.h
@@ -14,26 +14,27 @@ int CmdHF14ADesRb(const char* cmd);
 int CmdHF14ADesWb(const char* cmd);
 int CmdHF14ADesInfo(const char *Cmd);
 int CmdHF14ADesEnumApplications(const char *Cmd);
-int CmdHF14ADesNonces(const char *Cmd);
+
 char * GetCardSizeStr( uint8_t fsize );
-char * GetVendorStr( uint8_t id);
-char * GetProtocolStr(uint8_t id);
+char * GetProtocolStr( uint8_t id );
+char * GetVersionStr( uint8_t major, uint8_t minor );
+void GetKeySettings( uint8_t * aid );
 
 // Command options for Desfire behavior.
 enum  {
  NONE		= 	0x00,
  INIT 		=	0x01,
  DISCONNECT =	0x02,
- FOO		= 	0x04,
+ CLEARTRACE	= 	0x04,
  BAR		= 	0x08,
 } CmdOptions ;
 
 
-#define  CREATE_APPLICATION 			0xca
-#define  DELETE_APPLICATION 			0xda
-#define  GET_APPLICATION_IDS 			0x6a
-#define      SELECT_APPLICATION 		0x5a
-#define      FORMAT_PICC 				0xfc
+#define  CREATE_APPLICATION 			 0xca
+#define  DELETE_APPLICATION 			 0xda
+#define  GET_APPLICATION_IDS 			 0x6a
+#define      SELECT_APPLICATION 		 0x5a
+#define      FORMAT_PICC 				 0xfc
 #define      GET_VERSION 				 0x60
 #define      READ_DATA 					 0xbd
 #define      WRITE_DATA					 0x3d
@@ -48,6 +49,7 @@ enum  {
 #define      ABORT_TRANSACTION 			 0xa7
 #define      GET_FREE_MEMORY             0x6e
 #define  	GET_FILE_IDS 				 0x6f
+#define  	GET_ISOFILE_IDS 			 0x61
 #define     GET_FILE_SETTINGS 			 0xf5
 #define     CHANGE_FILE_SETTINGS 		 0x5f
 #define     CREATE_STD_DATA_FILE 		 0xcd
@@ -65,9 +67,9 @@ enum  {
 #define     GET_KEY_VERSION 			 0x64
 #define     AUTHENTICATION_FRAME 		 0xAF
 
-
+#define MAX_NUM_KEYS 0x0F
 #define MAX_APPLICATION_COUNT 28
-#define MAX_FILE_COUNT 16
+#define MAX_FILE_COUNT 32
 #define MAX_FRAME_SIZE 60
 #define NOT_YET_AUTHENTICATED 255
 #define FRAME_PAYLOAD_SIZE (MAX_FRAME_SIZE - 5)
\ No newline at end of file