Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/changes.txt

diff --combined docs/changes.txt
index 81f3b40,9e8c1a3..a0a7d4a
--- 1/docs/changes.txt
--- 2/docs/changes.txt
+++ b/docs/changes.txt
@@@ -14,7 -14,7 +14,8 @@@
  - Fixed a bug where hashcat is suppressing --machine-readable output in the final status update
  - Fixed a bug where hashcat did not check the return of realpath() and crashes uncontrolled if the path does not exist
  - Fixed a bug where hashcat crashes for accessing deallocated buffer if user spams "s" shortly before hashcat shuts down
+ - Fixed a bug where hashcat crashes in case of a scrypt P setting > 1
 +- Fixed a bug where hashcat did not correctly use the newly cracked plains whenever --loopback or the induction folder was used
  
  * changes v2.01 -> v3.00:
  

diff --combined src/hashcat.c
index f8e4b1a,ede2326..1a70430
--- 1/src/hashcat.c
--- 2/src/hashcat.c
+++ b/src/hashcat.c
@@@ -86,7 -86,7 +86,7 @@@ double TARGET_MS_PROFILE[4]     = { 2, 
  #define KERNEL_COMBS            1024
  #define KERNEL_BFS              1024
  #define KERNEL_THREADS_MAX      256
- #define KERNEL_THREADS_MAX_CPU  16
+ #define KERNEL_THREADS_MAX_CPU  1
  #define POWERTUNE_ENABLE        0
  #define LOGFILE_DISABLE         0
  #define SCRYPT_TMTO             0
@@@ -15053,6 -15053,9 +15053,9 @@@ int main (int argc, char **argv
  
        uint kernel_threads = MIN (KERNEL_THREADS_MAX, device_param->device_maxworkgroup_size);
  
+       if (hash_mode ==  8900) kernel_threads = 64; // Scrypt
+       if (hash_mode ==  9300) kernel_threads = 64; // Scrypt
+ 
        if (device_param->device_type & CL_DEVICE_TYPE_CPU)
        {
          kernel_threads = KERNEL_THREADS_MAX_CPU;
@@@ -15062,9 -15065,7 +15065,7 @@@
        if (hash_mode ==  3000) kernel_threads = 64; // DES
        if (hash_mode ==  3200) kernel_threads = 8;  // Blowfish
        if (hash_mode ==  7500) kernel_threads = 64; // RC4
-       if (hash_mode ==  8900) kernel_threads = 64; // Scrypt
        if (hash_mode ==  9000) kernel_threads = 8;  // Blowfish
-       if (hash_mode ==  9300) kernel_threads = 64; // Scrypt
        if (hash_mode ==  9700) kernel_threads = 64; // RC4
        if (hash_mode ==  9710) kernel_threads = 64; // RC4
        if (hash_mode ==  9800) kernel_threads = 64; // RC4
@@@ -15168,7 -15169,7 +15169,7 @@@
            }
          }
  
-         data.scrypt_tmp_size = (128 * scrypt_r);
+         data.scrypt_tmp_size = (128 * scrypt_r * scrypt_p);
  
          device_param->kernel_accel_min = 1;
          device_param->kernel_accel_max = 8;
@@@ -15212,7 -15213,7 +15213,7 @@@
            return -1;
          }
  
-         if (quiet == 0) log_info ("SCRYPT tmto optimizer value set to: %u, mem: %u\n", data.scrypt_tmto_final, size_scrypt);
+         if (quiet == 0) log_info ("SCRYPT tmto optimizer value set to: %u, mem: %llu\n", data.scrypt_tmto_final, (unsigned long long int) size_scrypt);
        }
  
        size_t size_scrypt4 = size_scrypt / 4;
@@@ -18392,10 -18393,6 +18393,10 @@@
          if (induction_dictionaries_cnt)
          {
            qsort (induction_dictionaries, induction_dictionaries_cnt, sizeof (char *), sort_by_mtime);
 +
 +          // yeah, this next statement is a little hack to make sure that --loopback runs correctly (because with it we guarantee that the loop iterates one more time)
 +
 +          dictpos--;
          }
  
          time_t runtime_stop;