arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-05-07 01:19:10 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	docs/changes.txt
This commit is contained in:
philsmd 2016-07-05 15:13:45 +02:00
commit f326c5de4c
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -14,6 +14,7 @@
- Fixed a bug where hashcat is suppressing --machine-readable output in the final status update - 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 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 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 - 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: * changes v2.01 -> v3.00:

4
src/Makefile
View File

@ -90,7 +90,7 @@ VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=
## Compiler flags ## Compiler flags
## ##
CFLAGS := -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/ CFLAGS += -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/
ifndef DEBUG ifndef DEBUG
CFLAGS += -O2 CFLAGS += -O2
@ -112,6 +112,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.9
CFLAGS_NATIVE := -D_POSIX -DDARWIN CFLAGS_NATIVE := -D_POSIX -DDARWIN
CFLAGS_NATIVE += $(CFLAGS) CFLAGS_NATIVE += $(CFLAGS)
LFLAGS_NATIVE := -lpthread LFLAGS_NATIVE := -lpthread
LFLAGS_NATIVE += $(LDFLAGS)
endif # darwin endif # darwin
ifeq ($(UNAME),Linux) ifeq ($(UNAME),Linux)
@ -122,6 +123,7 @@ endif
CFLAGS_NATIVE += $(CFLAGS) CFLAGS_NATIVE += $(CFLAGS)
LFLAGS_NATIVE := -lpthread -ldl LFLAGS_NATIVE := -lpthread -ldl
CFLAGS_NATIVE += -DHAVE_HWMON CFLAGS_NATIVE += -DHAVE_HWMON
LFLAGS_NATIVE += $(LDFLAGS)
endif # linux endif # linux
## ##

11
src/hashcat.c
View File

@ -86,7 +86,7 @@ double TARGET_MS_PROFILE[4] = { 2, 12, 96, 480 };
#define KERNEL_COMBS 1024 #define KERNEL_COMBS 1024
#define KERNEL_BFS 1024 #define KERNEL_BFS 1024
#define KERNEL_THREADS_MAX 256 #define KERNEL_THREADS_MAX 256
#define KERNEL_THREADS_MAX_CPU 16 #define KERNEL_THREADS_MAX_CPU 1
#define POWERTUNE_ENABLE 0 #define POWERTUNE_ENABLE 0
#define LOGFILE_DISABLE 0 #define LOGFILE_DISABLE 0
#define SCRYPT_TMTO 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); 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) if (device_param->device_type & CL_DEVICE_TYPE_CPU)
{ {
kernel_threads = KERNEL_THREADS_MAX_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 == 3000) kernel_threads = 64; // DES
if (hash_mode == 3200) kernel_threads = 8; // Blowfish if (hash_mode == 3200) kernel_threads = 8; // Blowfish
if (hash_mode == 7500) kernel_threads = 64; // RC4 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 == 9000) kernel_threads = 8; // Blowfish
if (hash_mode == 9300) kernel_threads = 64; // Scrypt
if (hash_mode == 9700) kernel_threads = 64; // RC4 if (hash_mode == 9700) kernel_threads = 64; // RC4
if (hash_mode == 9710) kernel_threads = 64; // RC4 if (hash_mode == 9710) kernel_threads = 64; // RC4
if (hash_mode == 9800) kernel_threads = 64; // RC4 if (hash_mode == 9800) kernel_threads = 64; // RC4
@ -15168,7 +15169,7 @@ int main (int argc, char **argv)
} }
} }
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_min = 1;
device_param->kernel_accel_max = 8; device_param->kernel_accel_max = 8;
@ -15212,7 +15213,7 @@ int main (int argc, char **argv)
return -1; 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; size_t size_scrypt4 = size_scrypt / 4;