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: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/480e2f239421563263d07f6d11f2c929d7f14d1f

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

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

480e2f239421563263d07f6d11f2c929d7f14d1f
diff --cc client/cmdhfmf.c
index 80c072f5,c54a0592..d6cae59f
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -711,8 -711,8 +712,9 @@@ int CmdHF14AMfNested(const char *Cmd
  		
  		// 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) { 
@@@ -1132,6 -1129,8 +1134,7 @@@ int CmdHF14AMfChk(const char *Cmd
  			// 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;
diff --cc client/cmdmain.c
index 1357c436,9072d49a..58783030
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@@ -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;
  		}
  	}
++
  }