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

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

diff --cc client/cmdhfmf.c
index 80c072f5033ee1154aad279b8440f605d8c80e5b,c54a0592839854ddb85531063a8a948e6ef44a92..d6cae59f0bfa46101b142cbbc43c842ce4462067
--- 1/client/cmdhfmf.c
--- 2/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@@ -711,8 -711,8 +712,9 @@@ int CmdHF14AMfNested(const char *Cmd
                \r
                // nested sectors\r
                iterations = 0;\r
+               PrintAndLog("enter nested...");\r
                bool calibrate = true;\r
 +\r
                for (i = 0; i < NESTED_SECTOR_RETRY; i++) {\r
                        for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; ++sectorNo) {\r
                                for (trgKeyType = 0; trgKeyType < 2; ++trgKeyType) { \r
@@@ -1132,6 -1129,8 +1134,7 @@@ int CmdHF14AMfChk(const char *Cmd
                        // skip already found keys.\r
                        if (e_sector[i].foundKey[trgKeyType]) continue;\r
                        \r
 -                      uint32_t max_keys = keycnt > (USB_CMD_DATA_SIZE/6) ? (USB_CMD_DATA_SIZE/6) : keycnt;\r
+                       \r
                        for (uint32_t c = 0; c < keycnt; c += max_keys) {\r
                                \r
                                uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;\r

diff --cc client/cmdmain.c
index 1357c436d2519c9e728fb943087035c1d14a20af,9072d49a0fc9d33a1d671c79fbb1ec196b5eec43..58783030d24e4b8db1097654ef85d03d5db7c750
--- 1/client/cmdmain.c
--- 2/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;
                }
        }
++
  }