From 53faf6a24a94e47dbda95edced18afe3cfc97185 Mon Sep 17 00:00:00 2001 From: Gabriele 'matrix' Gristina Date: Sun, 31 Jan 2016 17:38:05 +0100 Subject: [PATCH] Fixed some gpu loops/accel settings --- include/shared.h | 46 +++++++++++++++++++------------ src/oclHashcat.c | 72 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 97 insertions(+), 21 deletions(-) diff --git a/include/shared.h b/include/shared.h index d1362f976..413f70a07 100644 --- a/include/shared.h +++ b/include/shared.h @@ -187,15 +187,25 @@ extern hc_thread_mutex_t mux_display; */ #ifdef OSX +#define KERNEL_ACCEL_1800 1 +#define KERNEL_ACCEL_2500 2 #define KERNEL_ACCEL_5000 16 #define KERNEL_ACCEL_6100 1 #define KERNEL_ACCEL_6211 2 #define KERNEL_ACCEL_6231 1 #define KERNEL_ACCEL_6241 4 +#define KERNEL_ACCEL_7100 1 +#define KERNEL_ACCEL_7200 1 +#define KERNEL_ACCEL_7900 1 #define KERNEL_ACCEL_8200 1 #define KERNEL_ACCEL_8700 2 +#define KERNEL_ACCEL_9100 4 +#define KERNEL_ACCEL_9200 1 +#define KERNEL_ACCEL_9300 1 +#define KERNEL_ACCEL_9400 1 #define KERNEL_ACCEL_9500 1 #define KERNEL_ACCEL_9600 1 +#define KERNEL_ACCEL_10000 1 #define KERNEL_ACCEL_10500 4 #define KERNEL_ACCEL_11300 1 #define KERNEL_ACCEL_11600 1 @@ -206,15 +216,25 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_ACCEL_12500 1 #define KERNEL_ACCEL_13000 1 #else +#define KERNEL_ACCEL_1800 2 +#define KERNEL_ACCEL_2500 8 #define KERNEL_ACCEL_5000 64 #define KERNEL_ACCEL_6100 8 #define KERNEL_ACCEL_6211 16 #define KERNEL_ACCEL_6231 4 #define KERNEL_ACCEL_6241 32 +#define KERNEL_ACCEL_7100 2 +#define KERNEL_ACCEL_7200 2 +#define KERNEL_ACCEL_7900 2 #define KERNEL_ACCEL_8200 2 #define KERNEL_ACCEL_8700 8 +#define KERNEL_ACCEL_9100 8 +#define KERNEL_ACCEL_9200 2 +#define KERNEL_ACCEL_9300 2 +#define KERNEL_ACCEL_9400 8 #define KERNEL_ACCEL_9500 8 #define KERNEL_ACCEL_9600 2 +#define KERNEL_ACCEL_10000 2 #define KERNEL_ACCEL_10500 64 #define KERNEL_ACCEL_11300 2 #define KERNEL_ACCEL_11600 2 @@ -286,11 +306,9 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_ACCEL_1740 64 #define KERNEL_ACCEL_1750 32 #define KERNEL_ACCEL_1760 32 -#define KERNEL_ACCEL_1800 2 #define KERNEL_ACCEL_2100 8 #define KERNEL_ACCEL_2400 64 #define KERNEL_ACCEL_2410 64 -#define KERNEL_ACCEL_2500 8 #define KERNEL_ACCEL_2600 64 #define KERNEL_ACCEL_2611 64 #define KERNEL_ACCEL_2612 64 @@ -333,15 +351,12 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_ACCEL_6700 8 #define KERNEL_ACCEL_6800 8 #define KERNEL_ACCEL_6900 16 -#define KERNEL_ACCEL_7100 2 -#define KERNEL_ACCEL_7200 2 #define KERNEL_ACCEL_7300 64 #define KERNEL_ACCEL_7400 2 #define KERNEL_ACCEL_7500 8 #define KERNEL_ACCEL_7600 64 #define KERNEL_ACCEL_7700 16 #define KERNEL_ACCEL_7800 8 -#define KERNEL_ACCEL_7900 2 #define KERNEL_ACCEL_8000 8 #define KERNEL_ACCEL_8100 64 #define KERNEL_ACCEL_8300 64 @@ -351,10 +366,6 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_ACCEL_8800 8 #define KERNEL_ACCEL_8900 16 #define KERNEL_ACCEL_9000 2 -#define KERNEL_ACCEL_9100 8 -#define KERNEL_ACCEL_9200 2 -#define KERNEL_ACCEL_9300 2 -#define KERNEL_ACCEL_9400 8 #define KERNEL_ACCEL_9700 8 #define KERNEL_ACCEL_9710 8 #define KERNEL_ACCEL_9720 8 @@ -362,7 +373,6 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_ACCEL_9810 8 #define KERNEL_ACCEL_9820 8 #define KERNEL_ACCEL_9900 64 -#define KERNEL_ACCEL_10000 2 #define KERNEL_ACCEL_10100 128 #define KERNEL_ACCEL_10200 64 #define KERNEL_ACCEL_10300 8 @@ -454,7 +464,7 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_LOOPS_2711 2 #define KERNEL_LOOPS_2811 2 #define KERNEL_LOOPS_3100 2 -#define KERNEL_LOOPS_3200 4 +#define KERNEL_LOOPS_3200 2 #define KERNEL_LOOPS_3710 2 #define KERNEL_LOOPS_3711 2 #define KERNEL_LOOPS_3800 2 @@ -484,13 +494,14 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_LOOPS_7800 2 #define KERNEL_LOOPS_8000 2 #define KERNEL_LOOPS_8100 2 +#define KERNEL_LOOPS_8200 1 #define KERNEL_LOOPS_8300 2 #define KERNEL_LOOPS_8400 2 #define KERNEL_LOOPS_8500 2 #define KERNEL_LOOPS_8600 2 -#define KERNEL_LOOPS_8700 4 +#define KERNEL_LOOPS_8700 2 #define KERNEL_LOOPS_9700 2 -#define KERNEL_LOOPS_9710 8 +#define KERNEL_LOOPS_9710 2 #define KERNEL_LOOPS_9720 8 #define KERNEL_LOOPS_9800 2 #define KERNEL_LOOPS_9810 2 @@ -507,10 +518,11 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_LOOPS_11000 2 #define KERNEL_LOOPS_11100 2 #define KERNEL_LOOPS_11200 2 +#define KERNEL_LOOPS_11300 1 #define KERNEL_LOOPS_11400 2 #define KERNEL_LOOPS_11500 2 -#define KERNEL_LOOPS_11700 8 -#define KERNEL_LOOPS_11800 8 +#define KERNEL_LOOPS_11700 2 +#define KERNEL_LOOPS_11800 2 #define KERNEL_LOOPS_12600 2 #else #define KERNEL_LOOPS_0 256 @@ -605,6 +617,7 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_LOOPS_7800 64 #define KERNEL_LOOPS_8000 64 #define KERNEL_LOOPS_8100 128 +#define KERNEL_LOOPS_8200 200 #define KERNEL_LOOPS_8300 64 #define KERNEL_LOOPS_8400 64 #define KERNEL_LOOPS_8500 16 @@ -628,6 +641,7 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_LOOPS_11000 256 #define KERNEL_LOOPS_11100 128 #define KERNEL_LOOPS_11200 128 +#define KERNEL_LOOPS_11300 256 #define KERNEL_LOOPS_11400 128 #define KERNEL_LOOPS_11500 256 #define KERNEL_LOOPS_11700 64 @@ -666,7 +680,6 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_LOOPS_7200 200 #define KERNEL_LOOPS_7400 200 #define KERNEL_LOOPS_7900 256 -#define KERNEL_LOOPS_8200 200 #define KERNEL_LOOPS_8800 256 #define KERNEL_LOOPS_8900 1 #define KERNEL_LOOPS_9000 16 @@ -680,7 +693,6 @@ extern hc_thread_mutex_t mux_display; #define KERNEL_LOOPS_10300 128 #define KERNEL_LOOPS_10500 64 #define KERNEL_LOOPS_10900 200 -#define KERNEL_LOOPS_11300 256 #define KERNEL_LOOPS_11600 512 #define KERNEL_LOOPS_11900 200 #define KERNEL_LOOPS_12000 200 diff --git a/src/oclHashcat.c b/src/oclHashcat.c index 6c2069f64..4fa2ddf8f 100644 --- a/src/oclHashcat.c +++ b/src/oclHashcat.c @@ -11402,16 +11402,25 @@ int main (int argc, char **argv) kernel_accel = 32; break; case 1800: kernel_loops = ROUNDS_SHA512CRYPT; + #ifndef OSX kernel_accel = 16; + #endif break; case 2100: kernel_loops = ROUNDS_DCC2; kernel_accel = 16; break; case 2500: kernel_loops = ROUNDS_WPA2; + #ifndef OSX kernel_accel = 32; + #endif break; - case 3200: kernel_loops = ROUNDS_BCRYPT; + case 3200: + #ifndef OSX + kernel_loops = ROUNDS_BCRYPT; kernel_accel = 8; + #else + kernel_loops = ROUNDS_BCRYPT / 2; + #endif break; case 5200: kernel_loops = ROUNDS_PSAFE3; kernel_accel = 16; @@ -11439,8 +11448,14 @@ int main (int argc, char **argv) case 6223: kernel_loops = ROUNDS_TRUECRYPT_1K; kernel_accel = 8; break; - case 6231: kernel_loops = ROUNDS_TRUECRYPT_1K; + case 6231: + #ifndef OSX + kernel_loops = ROUNDS_TRUECRYPT_1K; kernel_accel = 8; + #else + kernel_loops = ROUNDS_TRUECRYPT_1K / 4; + kernel_accel = 1; + #endif break; case 6232: kernel_loops = ROUNDS_TRUECRYPT_1K; kernel_accel = 8; @@ -11448,9 +11463,13 @@ int main (int argc, char **argv) case 6233: kernel_loops = ROUNDS_TRUECRYPT_1K; kernel_accel = 8; break; - case 6241: kernel_loops = ROUNDS_TRUECRYPT_1K; + case 6241: #ifndef OSX + kernel_loops = ROUNDS_TRUECRYPT_1K; kernel_accel = 128; + #else + kernel_loops = ROUNDS_TRUECRYPT_1K / 4; + kernel_accel = 1; #endif break; case 6242: kernel_loops = ROUNDS_TRUECRYPT_1K; @@ -11478,21 +11497,34 @@ int main (int argc, char **argv) kernel_accel = 64; break; case 7100: kernel_loops = ROUNDS_SHA512OSX; + #ifndef OSX kernel_accel = 8; + #else + kernel_accel = 1; + #endif break; case 7200: kernel_loops = ROUNDS_GRUB; #ifndef OSX kernel_accel = 16; + #else + kernel_accel = 2; #endif break; case 7400: kernel_loops = ROUNDS_SHA256CRYPT; kernel_accel = 8; break; case 7900: kernel_loops = ROUNDS_DRUPAL7; + #ifndef OSX kernel_accel = 8; + #endif break; - case 8200: kernel_loops = ROUNDS_CLOUDKEY; + case 8200: + #ifndef OSX + kernel_loops = ROUNDS_CLOUDKEY; kernel_accel = 8; + #else + kernel_accel = 1; + #endif break; case 8800: kernel_loops = ROUNDS_ANDROIDFDE; kernel_accel = 32; @@ -11504,25 +11536,43 @@ int main (int argc, char **argv) kernel_accel = 16; break; case 9100: kernel_loops = ROUNDS_LOTUS8; + #ifndef OSX kernel_accel = 64; + #endif break; case 9200: kernel_loops = ROUNDS_CISCO8; + #ifndef OSX kernel_accel = 8; + #endif break; case 9300: kernel_loops = 1; + #ifndef OSX kernel_accel = 4; + #else + kernel_accel = 2; + #endif break; case 9400: kernel_loops = ROUNDS_OFFICE2007; + #ifndef OSX kernel_accel = 32; + #endif break; case 9500: kernel_loops = ROUNDS_OFFICE2010; + #ifndef OSX kernel_accel = 32; + #endif break; case 9600: kernel_loops = ROUNDS_OFFICE2013; + #ifndef OSX kernel_accel = 8; + #else + kernel_accel = 1; + #endif break; case 10000: kernel_loops = ROUNDS_DJANGOPBKDF2; + #ifndef OSX kernel_accel = 8; + #endif break; case 10300: kernel_loops = ROUNDS_SAPH_SHA1; kernel_accel = 16; @@ -11536,11 +11586,15 @@ int main (int argc, char **argv) case 10900: kernel_loops = ROUNDS_PBKDF2_SHA256; kernel_accel = 8; break; + #ifndef OSX case 11300: kernel_loops = ROUNDS_BITCOIN_WALLET; kernel_accel = 8; break; + #endif case 11600: kernel_loops = ROUNDS_SEVEN_ZIP; + #ifndef OSX kernel_accel = 8; + #endif break; case 11900: kernel_loops = ROUNDS_PBKDF2_MD5; kernel_accel = 8; @@ -11552,13 +11606,19 @@ int main (int argc, char **argv) kernel_accel = 8; break; case 12200: kernel_loops = ROUNDS_ECRYPTFS; + #ifndef OSX kernel_accel = 8; + #else + kernel_accel = 1; + #endif break; case 12300: kernel_loops = ROUNDS_ORACLET; kernel_accel = 8; break; case 12500: kernel_loops = ROUNDS_RAR3; + #ifndef OSX kernel_accel = 32; + #endif break; case 12700: kernel_loops = ROUNDS_MYWALLET; kernel_accel = 512; @@ -11570,7 +11630,11 @@ int main (int argc, char **argv) kernel_accel = 8; break; case 13000: kernel_loops = ROUNDS_RAR5; + #ifndef OSX kernel_accel = 8; + #else + kernel_accel = 2; + #endif break; }