From: marshmellow42 <marshmellowrf@gmail.com>
Date: Thu, 21 May 2015 15:17:01 +0000 (-0400)
Subject: hf mfu bug fixes, and help text fixes
X-Git-Tag: v2.1.0~12^2~3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/efd193519c5e4613a16b7a13dd69a9962df0b218?ds=sidebyside;hp=--cc

hf mfu bug fixes, and help text fixes
---

efd193519c5e4613a16b7a13dd69a9962df0b218
diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 7f0e8fc5..b3304f16 100644
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -600,7 +600,7 @@ uint32_t GetHF14AMfU_Type(void){
 					tagtype = UL;
 				} else {
 					// read page 0x30 (should error if it is a ntag203)
-					status = ul_read(30, data, sizeof(data));
+					status = ul_read(0x30, data, sizeof(data));
 					if ( status <= 1 ){
 						tagtype = NTAG_203;
 					} else {
@@ -679,7 +679,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 
 	//Validations
 	if(errors) return usage_hf_mfu_info();
-	
+
 	TagTypeUL_t tagtype = GetHF14AMfU_Type();
 	if (tagtype == UL_ERROR) return -1;
 
@@ -698,7 +698,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
 	} else if (status == 16) {
 		ul_print_default(data);
 		ndef_print_CC(data+12);
-	}	else {
+	} else {
 		locked = true;
 	}
 
@@ -740,11 +740,10 @@ int CmdHF14AMfUInfo(const char *Cmd){
 					uint8_t keySwap[16];
 					memcpy(keySwap, SwapEndian64(key,16,8), 16);
 					ulc_print_3deskey(keySwap);
-					break;
+					return 1;
 				} 
 			}
-			// reselect for future tests (ntag test)
-			if (!ul_auth_select( &card, tagtype, hasAuthKey, authenticationkey, pack, sizeof(pack))) return -1;
+			return 1;
 		}
 	}
 
@@ -950,8 +949,8 @@ int usage_hf_mfu_info(void)
 	PrintAndLog("It gathers information about the tag and tries to detect what kind it is.");
 	PrintAndLog("Sometimes the tags are locked down, and you may need a key to be able to read the information");
 	PrintAndLog("The following tags can be identified:\n");
-	PrintAndLog("Ultralight, Ultralight-C, Ultralight EV1");
-	PrintAndLog("NTAG 213, NTAG 215, NTAG 216");
+	PrintAndLog("Ultralight, Ultralight-C, Ultralight EV1, NTAG 203, NTAG 210,");
+	PrintAndLog("NTAG 212, NTAG 213, NTAG 215, NTAG 216, NTAG I2C 1K & 2K");
 	PrintAndLog("my-d, my-d NFC, my-d move, my-d move NFC\n");
 	PrintAndLog("Usage:  hf mfu info k <key>");
 	PrintAndLog("  Options : ");
@@ -965,6 +964,7 @@ int usage_hf_mfu_info(void)
 int usage_hf_mfu_dump(void)
 {
 	PrintAndLog("Reads all pages from Ultralight, Ultralight-C, Ultralight EV1");
+	PrintAndLog("NTAG 203, NTAG 210, NTAG 212, NTAG 213, NTAG 215, NTAG 216");
 	PrintAndLog("and saves binary dump into the file `filename.bin` or `cardUID.bin`");
 	PrintAndLog("It autodetects card type.\n");	
 	PrintAndLog("Usage:  hf mfu dump l k <key> n <filename w/o .bin>");