From: iceman <iceman@iuse.se>
Date: Wed, 10 Feb 2016 12:29:23 +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/480e2f239421563263d07f6d11f2c929d7f14d1f?hp=-c

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

Conflicts:
	client/cmdhfmf.c
	client/cmdmain.c
---

480e2f239421563263d07f6d11f2c929d7f14d1f
diff --combined client/cmdhfmf.c
index 80c072f5,c54a0592..d6cae59f
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -53,7 -53,7 +53,7 @@@ start
  
  	// wait cycle
  	while (true) {
- 		printf(".");
+         printf(".");
  		fflush(stdout);
  		if (ukbhit()) {
  			tmpchar = getchar();
@@@ -63,17 -63,18 +63,18 @@@
  		}
  		
  		UsbCommand resp;
- 		if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+ 		if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
  			isOK  = resp.arg[0];
+ 			printf("\n\n");
  			switch (isOK) {
  				case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;
  				case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;
  				case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;
  				case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
- 					  PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;
+ 						  PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;
  				default: ;
  			}
- 			uid = (uint32_t)bytes_to_num(resp.d.asBytes, 4);
+ 			uid = (uint32_t)bytes_to_num(resp.d.asBytes +  0, 4);
  			nt =  (uint32_t)bytes_to_num(resp.d.asBytes +  4, 4);
  			par_list = bytes_to_num(resp.d.asBytes +  8, 8);
  			ks_list = bytes_to_num(resp.d.asBytes +  16, 8);
@@@ -706,13 -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) { 
@@@ -731,7 -731,7 +733,7 @@@
  						case -5 :
  							calibrate = false;
  							iterations++;
- 							e_sector[sectorNo].foundKey[trgKeyType] = TRUE;
+ 							e_sector[sectorNo].foundKey[trgKeyType] = 1;
  							e_sector[sectorNo].Key[trgKeyType] = bytes_to_num(keyBlock, 6);
  							continue;
  							
@@@ -742,10 -742,6 +744,10 @@@
  				}
  			}
  		}
 +		
 +		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...");
@@@ -763,7 -759,7 +765,7 @@@
  				SendCommand(&c);
  
  				UsbCommand resp;
- 				if ( !WaitForResponseTimeout(CMD_ACK, &resp, 1500)) continue;
+ 				if ( !WaitForResponseTimeout(CMD_ACK,&resp,1500)) continue;
  					
  				uint8_t isOK  = resp.arg[0] & 0xff;
  				if (!isOK) continue;
@@@ -772,12 -768,15 +774,12 @@@
  				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 );
@@@ -1048,7 -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++;
@@@ -1088,7 -1087,7 +1090,7 @@@
  					}
  					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));
  				}
@@@ -1105,7 -1104,7 +1107,7 @@@
  	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);
  	}
@@@ -1118,27 -1117,27 +1120,28 @@@
  	}
  
  	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) {
  				
  				uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
  				
  				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;
@@@ -1151,11 -1150,6 +1154,11 @@@
  			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++) {
@@@ -1186,7 -1180,10 +1189,7 @@@
  			}
  		}
  	}
 -	
 -	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 --combined client/cmdmain.c
index 1357c436,9072d49a..58783030
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@@ -120,7 -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;
  
@@@ -147,10 -146,10 +147,10 @@@ bool WaitForResponseTimeout(uint32_t cm
  	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...");
@@@ -182,24 -181,27 +182,26 @@@ void UsbCommandReceived(UsbCommand *UC
  		// First check if we are handling a debug message
  		case CMD_DEBUG_PRINT_STRING: {
  			char s[USB_CMD_DATA_SIZE+1];
- 			memset(s, 0x00, sizeof(s));
- 			size_t len = MIN(UC->arg[0], USB_CMD_DATA_SIZE);
+ 			memset(s, 0x00, sizeof(s)); 
+ 			size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
  			memcpy(s, UC->d.asBytes, len);
  			PrintAndLog("#db# %s", s);
+ 			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;
  		}
  	}
++
  }