From dc9696bc3f3243dcdeb7ce9cf4d743c64178fa8f Mon Sep 17 00:00:00 2001 From: jsteube Date: Mon, 4 Jul 2016 21:41:20 +0200 Subject: [PATCH] Make scrypt thread count fixed only for non-CPU OpenCL devices --- src/hashcat.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/hashcat.c b/src/hashcat.c index 3400ee2b9..ede23260d 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -86,7 +86,7 @@ double TARGET_MS_PROFILE[4] = { 2, 12, 96, 480 }; #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 @@ 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 @@ int main (int argc, char **argv) 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