X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c948cbde8cdb6870daa7df8fef0bef76b8da5333..bfaecce6ebf50e296a1a4d221411581ff96f91c3:/client/cmdhfmf.c

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c7f51ed8..dff5db37 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -71,17 +71,22 @@ start:
 	if (isOK != 1) return 1;
 	
 	// execute original function from util nonce2key
-	if (nonce2key(uid, nt, par_list, ks_list, &r_key)) return 2;
-	printf("------------------------------------------------------------------\n");
-	PrintAndLog("Key found:%012llx \n", r_key);
+	if (nonce2key(uid, nt, par_list, ks_list, &r_key))
+	{
+		isOK = 2;
+		PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);	
+	} else {
+		printf("------------------------------------------------------------------\n");
+		PrintAndLog("Key found:%012llx \n", r_key);
 
-	num_to_bytes(r_key, 6, keyBlock);
-	isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);
+		num_to_bytes(r_key, 6, keyBlock);
+		isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);
+	}
 	if (!isOK) 
 		PrintAndLog("Found valid key:%012llx", r_key);
 	else
 	{
-		PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt);	
+		if (isOK != 2) PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt);	
 		c.arg[0] = nt;
 		goto start;
 	}
@@ -984,10 +989,6 @@ int CmdHF14AMfEGet(const char *Cmd)
 	}	
 	
 	blockNo = param_get8(Cmd, 0);
-	if (blockNo >= 32 * 4 + 8 * 16) {
-		PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");
-		return 1;
-	}
 
 	PrintAndLog(" ");
 	if (!mfEmlGetMem(data, blockNo, 3)) {
@@ -1028,10 +1029,6 @@ int CmdHF14AMfESet(const char *Cmd)
 	}	
 	
 	blockNo = param_get8(Cmd, 0);
-	if (blockNo >= 32 * 4 + 8 * 16) {
-		PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");
-		return 1;
-	}
 	
 	if (param_gethex(Cmd, 1, memBlock, 32)) {
 		PrintAndLog("block data must include 32 HEX symbols");
@@ -1269,10 +1266,6 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
 	}	
 
 	blockNo = param_get8(Cmd, 0);
-	if (blockNo >= 32 * 4 + 8 * 16) {
-		PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");
-		return 1;
-	}
 
 	if (param_gethex(Cmd, 1, memBlock, 32)) {
 		PrintAndLog("block data must include 32 HEX symbols");
@@ -1400,10 +1393,6 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
 	}	
 
 	blockNo = param_get8(Cmd, 0);
-	if (blockNo >= 32 * 4 + 8 * 16) {
-		PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");
-		return 1;
-	}
 
 	PrintAndLog("--block number:%02x ", blockNo);
 
@@ -1545,7 +1534,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 	// params
 	bool wantLogToFile = 0;
 	bool wantDecrypt = 0;
-	bool wantSaveToEml = 0;
+	//bool wantSaveToEml = 0; TODO
 	bool wantSaveToEmlFile = 0;
 
 	//var 
@@ -1558,6 +1547,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 	uint8_t atqa[2];
 	uint8_t sak;
 	bool isTag;
+	uint32_t parity;
 	uint8_t buf[3000];
 	uint8_t * bufPtr = buf;
 	memset(buf, 0x00, 3000);
@@ -1578,7 +1568,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 		char ctmp = param_getchar(Cmd, i);
 		if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;
 		if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;
-		if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true;
+		//if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO
 		if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;
 	}
 	
@@ -1625,7 +1615,9 @@ int CmdHF14AMfSniff(const char *Cmd){
 				num = 0;
 				while (bufPtr - buf + 9 < blockLen) {
 				  isTag = bufPtr[3] & 0x80 ? true:false;
-					bufPtr += 8;
+					bufPtr += 4;
+					parity = *((uint32_t *)(bufPtr));
+					bufPtr += 4;
 					len = bufPtr[0];
 					bufPtr++;
 					if ((len == 14) && (bufPtr[0] = 0xff) && (bufPtr[1] = 0xff)) {
@@ -1642,7 +1634,7 @@ int CmdHF14AMfSniff(const char *Cmd){
 					} else {
 						PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));
 						if (wantLogToFile) AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);
-						if (wantDecrypt) mfTraceDecode(bufPtr, len, wantSaveToEmlFile);
+						if (wantDecrypt) mfTraceDecode(bufPtr, len, parity, wantSaveToEmlFile);
 					}
 					bufPtr += len;
 					num++;