X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/24344f28ad0fd610da20436961a2b9d98238dc0d..368044201a6a4d0802f708b03becf3e49ada37ab:/client/cmdhfmfu.c

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index cf21a9bf..5bb9a91e 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -58,12 +58,21 @@ uint8_t default_pwd_pack[KEYS_PWD_COUNT][4] = {
 };
 
 #define MAX_UL_TYPES 18
-uint32_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {UNKNOWN, UL, UL_C, UL_EV1_48, UL_EV1_128, NTAG, NTAG_203,
-	    NTAG_210, NTAG_212, NTAG_213, NTAG_215, NTAG_216, MY_D, MY_D_NFC, MY_D_MOVE, MY_D_MOVE_NFC, MY_D_MOVE_LEAN, FUDAN_UL};
-
-uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS, MAX_ULEV1a_BLOCKS,
-	    MAX_ULEV1b_BLOCKS, MAX_NTAG_203, MAX_NTAG_203, MAX_NTAG_210, MAX_NTAG_212, MAX_NTAG_213,
-	    MAX_NTAG_215, MAX_NTAG_216, MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE, MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS};
+uint32_t UL_TYPES_ARRAY[MAX_UL_TYPES] = {
+		UNKNOWN, UL, UL_C, 
+		UL_EV1_48, UL_EV1_128, NTAG,
+		NTAG_203, NTAG_210, NTAG_212,
+		NTAG_213, NTAG_215, NTAG_216,
+		MY_D, MY_D_NFC, MY_D_MOVE,
+		MY_D_MOVE_NFC, MY_D_MOVE_LEAN, FUDAN_UL};
+
+uint8_t UL_MEMORY_ARRAY[MAX_UL_TYPES] = {
+		MAX_UL_BLOCKS, MAX_UL_BLOCKS, MAX_ULC_BLOCKS,
+		MAX_ULEV1a_BLOCKS, MAX_ULEV1b_BLOCKS, MAX_NTAG_203,
+		MAX_NTAG_203, MAX_NTAG_210, MAX_NTAG_212,
+		MAX_NTAG_213, MAX_NTAG_215, MAX_NTAG_216, 
+		MAX_UL_BLOCKS, MAX_MY_D_NFC, MAX_MY_D_MOVE,
+		MAX_MY_D_MOVE, MAX_MY_D_MOVE_LEAN, MAX_UL_BLOCKS};
 
 
 static int CmdHelp(const char *Cmd);
@@ -272,7 +281,7 @@ static int ulev1_readSignature( uint8_t *response, uint16_t responseLength ){
 //  send 300000 + crc (read with extra byte(s))
 //  UL responds with read of page 0, fudan doesn't respond.
 //
-//make sure field is off before calling this function
+// make sure field is off before calling this function
 static int ul_fudan_check( void ){
 	iso14a_card_select_t card;
 	if ( !ul_select(&card) ) 
@@ -799,6 +808,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 		}
 	}
 
+	// Read signature
 	if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_213 | NTAG_215 | NTAG_216 | NTAG_I2C_1K | NTAG_I2C_2K	))) {
 		uint8_t ulev1_signature[32] = {0x00};
 		status = ulev1_readSignature( ulev1_signature, sizeof(ulev1_signature));
@@ -814,6 +824,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 		}
 	}
 
+	// Get Version
 	if ((tagtype & (UL_EV1_48 | UL_EV1_128 | NTAG_210 | NTAG_212 | NTAG_213 | NTAG_215 | NTAG_216 | NTAG_I2C_1K | NTAG_I2C_2K))) {
 		uint8_t version[10] = {0x00};
 		status  = ulev1_getVersion(version, sizeof(version));
@@ -892,7 +903,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 	uint8_t data[16] = {0x00};
 	uint8_t authenticationkey[16] = {0x00};
 	uint8_t *authKeyPtr = authenticationkey;
-	
+
 	while(param_getchar(Cmd, cmdp) != 0x00)
 	{
 		switch(param_getchar(Cmd, cmdp))
@@ -967,7 +978,7 @@ int CmdHF14AMfUWrBl(const char *Cmd){
 		PrintAndLog("block number too large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
 		return usage_hf_mfu_wrbl();
 	}
-	
+
 	// Swap endianness 
 	if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
 	if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
@@ -1083,7 +1094,7 @@ int CmdHF14AMfURdBl(const char *Cmd){
 		PrintAndLog("block number to large. Max block is %u/0x%02X \n", maxblockno,maxblockno);
 		return usage_hf_mfu_rdbl();
 	}
-	
+
 	// Swap endianness 
 	if (swapEndian && hasAuthKey) authKeyPtr = SwapEndian64(authenticationkey, 16, 8);
 	if (swapEndian && hasPwdKey)  authKeyPtr = SwapEndian64(authenticationkey, 4, 4);
@@ -1188,7 +1199,7 @@ int usage_hf_mfu_wrbl(void) {
 
 int usage_hf_mfu_eload(void) {
 	PrintAndLog("It loads emulator dump from the file `filename.eml`\n");
-	PrintAndLog("Usage:  hf mf eload t <card memory> i <file name w/o `.eml`>\n");
+	PrintAndLog("Usage:  hf mfu eload t <card memory> i <file name w/o `.eml`>\n");
 	PrintAndLog("  Options:");	
 	PrintAndLog("  t <card memory> : Tag memorysize/type");
 	PrintAndLog("  i <file>        : file name w/o `.eml`");
@@ -1813,13 +1824,13 @@ int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 
 int CmdHF14AMfuELoad(const char *Cmd)
 {
-	FILE * f;
-	char filename[FILE_PATH_SIZE];
-	char *fnameptr = filename;
-	char buf[64] = {0x00};
-	uint8_t buf8[64] = {0x00};
-	int i, len, blockNum, numBlocks;
-	int nameParamNo = 1;
+	//FILE * f;
+	//char filename[FILE_PATH_SIZE];
+	//char *fnameptr = filename;
+	//char buf[64] = {0x00};
+	//uint8_t buf8[64] = {0x00};
+	//int i, len, blockNum, numBlocks;
+	//int nameParamNo = 1;
 	
 	char ctmp = param_getchar(Cmd, 0);
 		
@@ -1913,7 +1924,7 @@ static command_t CommandTable[] =
 	{"dump",	CmdHF14AMfUDump,	0, "Dump Ultralight / Ultralight-C / NTAG tag to binary file"},
 	{"rdbl",	CmdHF14AMfURdBl,	0, "Read block"},
 	{"wrbl",	CmdHF14AMfUWrBl,	0, "Write block"},
-	{"eload",	CmdHF14AMfuELoad,	0, "Load from file emulator dump"},
+	{"eload",	CmdHF14AMfuELoad,	0, "<not implemented> Load from file emulator dump"},
 	{"cauth",	CmdHF14AMfucAuth,	0, "Authentication    - Ultralight C"},
 	{"setpwd",	CmdHF14AMfucSetPwd, 1, "Set 3des password - Ultralight-C"},
 	{"setuid",	CmdHF14AMfucSetUid, 1, "Set UID - MAGIC tags only"},