From: iceman1001 <iceman@iuse.se>
Date: Wed, 10 Feb 2016 18:02:18 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/e8bf76a83f6df5abcc2ea23d9514b0e847f82e18?hp=b7536e11e19e11446785787d02e8d677339b45df

Merge branch 'master' of https://github.com/iceman1001/proxmark3
---

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index c54a0592..d6cae59f 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -707,12 +707,14 @@ int CmdHF14AMfNested(const char *Cmd)
 		clock_t t2 = clock() - t1;
 		if ( t2 > 0 )
 			PrintAndLog("Time to check 6 known keys: %.0f ticks %4.2f sec", (float)t2, ((float)t2)/CLOCKS_PER_SEC);
-	
+
+		PrintAndLog("enter nested...");	
 		
 		// nested sectors
 		iterations = 0;
 		PrintAndLog("enter nested...");
 		bool calibrate = true;
+
 		for (i = 0; i < NESTED_SECTOR_RETRY; i++) {
 			for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {
 				for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { 
@@ -742,6 +744,10 @@ int CmdHF14AMfNested(const char *Cmd)
 				}
 			}
 		}
+		
+		t1 = clock() - t1;
+		if ( t1 > 0 )
+			PrintAndLog("Time in nested: %.0f ticks %4.2f sec (%4.2f sec per key)\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);
 
 		// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
 		PrintAndLog("trying to read key B...");
@@ -768,15 +774,12 @@ int CmdHF14AMfNested(const char *Cmd)
 				key64 = bytes_to_num(data+10, 6);
 				if (key64) {
 					PrintAndLog("Data:%s", sprint_hex(data+10, 6));
-					e_sector[i].foundKey[1] = 1;
+					e_sector[i].foundKey[1] = TRUE;
 					e_sector[i].Key[1] = key64;
 				}
 			}
 		}
-		
-		t1 = clock() - t1;
-		if ( t1 > 0 )
-			PrintAndLog("Time in nested: %.0f ticks %4.2f sec (%4.2f sec per key)\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);
+
 		
 		//print them
 		printKeyTable( SectorsCnt, e_sector );
@@ -1047,7 +1050,7 @@ int CmdHF14AMfChk(const char *Cmd)
 				}
 				keyBlock = p;
 			}
-			PrintAndLog("check key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
+			PrintAndLog("key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
 			(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
 			(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
 			keycnt++;
@@ -1087,7 +1090,7 @@ int CmdHF14AMfChk(const char *Cmd)
 					}
 					memset(keyBlock + 6 * keycnt, 0, 6);
 					num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);
-					PrintAndLog("check custom key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
+					PrintAndLog("check key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));
 					keycnt++;
 					memset(buf, 0, sizeof(buf));
 				}
@@ -1104,7 +1107,7 @@ int CmdHF14AMfChk(const char *Cmd)
 	if (keycnt == 0) {
 		PrintAndLog("No key specified, trying default keys");
 		for (;keycnt < defaultKeysSize; keycnt++)
-			PrintAndLog("check default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
+			PrintAndLog("key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
 				(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],
 				(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4],	(keyBlock + 6*keycnt)[5], 6);
 	}
@@ -1117,19 +1120,20 @@ int CmdHF14AMfChk(const char *Cmd)
 	}
 
 	uint8_t trgKeyType = 0;
+	uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
 	
 	// time
 	clock_t t1 = clock();
 	
 	// check keys.
 	for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) {
+
 		int b = blockNo;
 		for (int i = 0; i < SectorsCnt; ++i) {
 			
 			// skip already found keys.
 			if (e_sector[i].foundKey[trgKeyType]) continue;
 			
-			uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;
 			
 			for (uint32_t c = 0; c < keycnt; c += max_keys) {
 				
@@ -1137,7 +1141,7 @@ int CmdHF14AMfChk(const char *Cmd)
 				
 				res = mfCheckKeys(b, trgKeyType, true, size, &keyBlock[6*c], &key64);
 				if (!res) {
-					PrintAndLog("Sector:%3d Block:%3d, key type: %C  -- Found key [%012"llx"]", i, b, trgKeyType ? 'B':'A', key64);
+					//PrintAndLog("Sector:%3d Block:%3d, key type: %C  -- Found key [%012"llx"]", i, b, trgKeyType ? 'B':'A', key64);
 										 
 					e_sector[i].Key[trgKeyType] = key64;
 					e_sector[i].foundKey[trgKeyType] = TRUE;
@@ -1150,6 +1154,11 @@ int CmdHF14AMfChk(const char *Cmd)
 			b < 127 ? ( b +=4 ) : ( b += 16 );	
 		}
 	}
+	
+	t1 = clock() - t1;
+	if ( t1 > 0 )
+		printf("Time in checkkeys: %.0f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);
+
 	// 20160116 If Sector A is found, but not Sector B,  try just reading it of the tag?
 	PrintAndLog("testing to read B...");
 	for (i = 0; i < SectorsCnt; i++) {
@@ -1180,10 +1189,7 @@ int CmdHF14AMfChk(const char *Cmd)
 			}
 		}
 	}
-	
-	t1 = clock() - t1;
-	if ( t1 > 0 )
-		printf("Time in checkkeys: %.0f ticks  %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);
+
 
 	//print them
 	printKeyTable( SectorsCnt, e_sector );
diff --git a/client/cmdhfmfhard.c b/client/cmdhfmfhard.c
index 07421ea1..eac783ff 100644
--- a/client/cmdhfmfhard.c
+++ b/client/cmdhfmfhard.c
@@ -686,8 +686,8 @@ static void Check_for_FilterFlipProperties(void)
 
 static void simulate_MFplus_RNG(uint32_t test_cuid, uint64_t test_key, uint32_t *nt_enc, uint8_t *par_enc)
 {
-	struct Crypto1State sim_cs;
-	sim_cs.odd = sim_cs.even = 0;
+	struct Crypto1State sim_cs = {0, 0};
+//	sim_cs.odd = sim_cs.even = 0;
 
 	// init cryptostate with key:
 	for(int8_t i = 47; i > 0; i -= 2) {
diff --git a/client/cmdmain.c b/client/cmdmain.c
index 9072d49a..58783030 100644
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -120,6 +120,7 @@ int getCommand(UsbCommand* response)
     //Pick out the next unread command
     UsbCommand* last_unread = &cmdBuffer[cmd_tail];
     memcpy(response, last_unread, sizeof(UsbCommand));
+
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
 
@@ -146,10 +147,10 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
 	for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) {
 
 		while( getCommand(response) ) {
-			if(response->cmd == cmd){
-				return true;
-			}
+			if(response->cmd == cmd)
+				return true;			
 		}
+
 		msleep(10); // XXX ugh
 		if (dm_seconds == 200) { // Two seconds elapsed
 			PrintAndLog("Waiting for a response from the proxmark...");
@@ -188,20 +189,19 @@ void UsbCommandReceived(UsbCommand *UC)
 			return;
 		} break;
 
-		case CMD_DEBUG_PRINT_INTEGERS: {
-			PrintAndLog("#db# %08x, %08x, %08x       \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
-			return;
-		} break;
+		case CMD_DEBUG_PRINT_INTEGERS:
+			PrintAndLog("#db# %08x, %08x, %08x", UC->arg[0], UC->arg[1], UC->arg[2]);
+			break;
 
-		case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
-			memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
-			return;
-		} break;
+		case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K:
+			memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
+			break;
 
 		default: {
 			storeCommand(UC);
 			break;
 		}
 	}
+
 }