arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-24 08:58:13 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/hashcat/hashcat

Browse Source
This commit is contained in:
Jens Steube 2016-11-28 17:35:30 +01:00
commit ee7bd18474
3 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -258,6 +258,14 @@ OBJS_ALL := affinity autotune benchmark bitmap bitops combinator
NATIVE_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.o) NATIVE_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.o)
NATIVE_SHARED_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.SHARED.o) NATIVE_SHARED_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.SHARED.o)
ifeq ($(UNAME),CYGWIN)
NATIVE_OBJS += $(CRT_GLOB)
endif # CYGWIN
ifeq ($(UNAME),MSYS2)
NATIVE_OBJS += $(CRT_GLOB)
endif # MSYS2
LINUX_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).LINUX.32.o) LINUX_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).LINUX.32.o)
LINUX_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).LINUX.64.o) LINUX_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).LINUX.64.o)

8
src/opencl.c
View File

@ -3761,7 +3761,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
//if (CL_rc == -1) return -1; //if (CL_rc == -1) return -1;
#if defined (DEBUG) #if defined (DEBUG)
if ((build_log_size != 0) || (CL_rc == -1)) if ((build_log_size > 1) || (CL_rc == -1))
#else #else
if (CL_rc == -1) if (CL_rc == -1)
#endif #endif
@ -3863,7 +3863,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
//if (CL_rc == -1) return -1; //if (CL_rc == -1) return -1;
#if defined (DEBUG) #if defined (DEBUG)
if ((build_log_size != 0) || (CL_rc == -1)) if ((build_log_size > 1) || (CL_rc == -1))
#else #else
if (CL_rc == -1) if (CL_rc == -1)
#endif #endif
@ -3967,7 +3967,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
//if (CL_rc == -1) return -1; //if (CL_rc == -1) return -1;
#if defined (DEBUG) #if defined (DEBUG)
if ((build_log_size != 0) || (CL_rc == -1)) if ((build_log_size > 1) || (CL_rc == -1))
#else #else
if (CL_rc == -1) if (CL_rc == -1)
#endif #endif
@ -4109,7 +4109,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
//if (CL_rc == -1) return -1; //if (CL_rc == -1) return -1;
#if defined (DEBUG) #if defined (DEBUG)
if ((build_log_size != 0) || (CL_rc == -1)) if ((build_log_size > 1) || (CL_rc == -1))
#else #else
if (CL_rc == -1) if (CL_rc == -1)
#endif #endif

34
src/win_file_globbing.mk
View File

@ -16,15 +16,18 @@ IS_WIN_BUILD := $(filter binaries,$(MG))$(filter win32,$(MG))$(filter win6
ifneq (,$(IS_WIN_BUILD)) ifneq (,$(IS_WIN_BUILD))
# entering this code path means: we need to check for CRT_glob.o since we try to build binaries for windows operating systems ifeq ($(UNAME),CYGWIN)
$(error Cross-compiling on $(UNAME) is not supported, please use the native target)
endif
ifeq ($(UNAME),MSYS2) ifeq ($(UNAME),MSYS2)
CRT_GLOB_LIB_PATH_32 ?= /mingw32/i686-w64-mingw32/lib/ $(error Cross-compiling on $(UNAME) is not supported, please use the native target)
CRT_GLOB_LIB_PATH_64 ?= /mingw64/x86_64-w64-mingw32/lib/ endif
else
# entering this code path means: we need to check for CRT_glob.o since we try to build binaries for windows operating systems
CRT_GLOB_LIB_PATH_32 ?= /usr/i686-w64-mingw32/lib/ CRT_GLOB_LIB_PATH_32 ?= /usr/i686-w64-mingw32/lib/
CRT_GLOB_LIB_PATH_64 ?= /usr/x86_64-w64-mingw32/lib/ CRT_GLOB_LIB_PATH_64 ?= /usr/x86_64-w64-mingw32/lib/
endif
CRT_GLOB_LIB_SYSROOT_32 := $(shell $(CC_WIN_32) --verbose 2>&1 | $(EGREP) -m 1 -o '(with-sysroot="[^"]"|with-sysroot=[^ ]*)' | $(SED) 's/^with-sysroot="\?\([^"]*\)"\?$$/\1/') CRT_GLOB_LIB_SYSROOT_32 := $(shell $(CC_WIN_32) --verbose 2>&1 | $(EGREP) -m 1 -o '(with-sysroot="[^"]"|with-sysroot=[^ ]*)' | $(SED) 's/^with-sysroot="\?\([^"]*\)"\?$$/\1/')
CRT_GLOB_LIB_SYSROOT_64 := $(shell $(CC_WIN_64) --verbose 2>&1 | $(EGREP) -m 1 -o '(with-sysroot="[^"]"|with-sysroot=[^ ]*)' | $(SED) 's/^with-sysroot="\?\([^"]*\)"\?$$/\1/') CRT_GLOB_LIB_SYSROOT_64 := $(shell $(CC_WIN_64) --verbose 2>&1 | $(EGREP) -m 1 -o '(with-sysroot="[^"]"|with-sysroot=[^ ]*)' | $(SED) 's/^with-sysroot="\?\([^"]*\)"\?$$/\1/')
@ -64,3 +67,24 @@ $(warning $(WARNING_MESSAGE))
endif endif
endif endif
IS_WIN_BUILD_NATIVE := $(filter CYGWIN,$(UNAME))$(filter MSYS2,$(UNAME))
ifneq (,$(IS_WIN_BUILD_NATIVE))
# entering this code path means: we need to check for CRT_glob.o since we try to build binaries for windows operating systems
CRT_GLOB := $(shell $(FIND) / -name $(CRT_GLOB_FILE_NAME) -print -quit)
ifeq (,$(CRT_GLOB))
define WARNING_MESSAGE=
! The MinGW CRT GLOB library was not found on your system. Please make sure that $(CRT_GLOB_FILE_NAME) exists
! ATTENTION: File globbing will be disabled
endef
$(warning $(WARNING_MESSAGE))
endif
endif