arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-04 03:41:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1529 from yarda/system-lzma-sdk

Browse Source 
Add support for building with system lzma-sdk
This commit is contained in:
Jens Steube 2018-03-03 18:37:29 +01:00 committed by GitHub
commit f6cfcbbc3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ext_lzma.h
View File

@ -5,9 +5,9 @@
#ifndef _EXT_LZMA_H #ifndef _EXT_LZMA_H
#include "lzma_sdk/Alloc.h" #include <Alloc.h>
#include "lzma_sdk/LzmaDec.h" #include <LzmaDec.h>
#include "lzma_sdk/Lzma2Dec.h" #include <Lzma2Dec.h>
int hc_lzma1_decompress (const unsigned char *in, SizeT *in_len, unsigned char *out, SizeT *out_len, const char *props); int hc_lzma1_decompress (const unsigned char *in, SizeT *in_len, unsigned char *out, SizeT *out_len, const char *props);
int hc_lzma2_decompress (const unsigned char *in, SizeT *in_len, unsigned char *out, SizeT *out_len, const char *props); int hc_lzma2_decompress (const unsigned char *in, SizeT *in_len, unsigned char *out, SizeT *out_len, const char *props);

18
src/Makefile
View File

@ -139,12 +139,15 @@ WIN_ICONV_64 := /opt/win-iconv-64
## ##
COMPTIME := $(shell date +%s) COMPTIME := $(shell date +%s)
SYSTEM_LZMA_SDK := 0
LZMA_SDK_INCLUDE := $(LIBRARY_DEV_ROOT_FOLDER)/lzma-sdk/C
## ##
## General compiler and linker options ## General compiler and linker options
## ##
CFLAGS += -pipe -std=gnu99 -Iinclude/ -Iinclude/lzma_sdk/ -IOpenCL/ CFLAGS += -pipe -std=gnu99 -Iinclude/ -IOpenCL/
ifeq ($(PRODUCTION),0) ifeq ($(PRODUCTION),0)
CFLAGS += -W CFLAGS += -W
@ -184,6 +187,13 @@ endif
#CFLAGS += -Wstack-usage=524288 #CFLAGS += -Wstack-usage=524288
ifeq ($(SYSTEM_LZMA_SDK),1)
CFLAGS += $(LZMA_SDK_INCLUDE)
LDFLAGS += -llzmasdk
else
CFLAGS +=-Iinclude/lzma_sdk/
endif
LFLAGS := $(LDFLAGS) LFLAGS := $(LDFLAGS)
ifeq ($(DEBUG),0) ifeq ($(DEBUG),0)
@ -300,7 +310,11 @@ LFLAGS_CROSS_WIN64 += -lpsapi
## Objects ## Objects
## ##
OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md4 cpu_md5 cpu_sha1 cpu_sha256 debugfile dictstat dispatch dynloader event ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_sysfs ext_lzma lzma_sdk/Alloc lzma_sdk/Lzma2Dec lzma_sdk/LzmaDec filehandling folder hashcat hashes hlfmt hwmon induct interface locking logfile loopback memory monitor mpsp opencl outfile_check outfile pidfile potfile restore rp rp_cpu rp_kernel_on_cpu rp_kernel_on_cpu_optimized selftest shared status stdout straight terminal thread timer tuningdb usage user_options wordlist OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md4 cpu_md5 cpu_sha1 cpu_sha256 debugfile dictstat dispatch dynloader event ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_sysfs ext_lzma filehandling folder hashcat hashes hlfmt hwmon induct interface locking logfile loopback memory monitor mpsp opencl outfile_check outfile pidfile potfile restore rp rp_cpu rp_kernel_on_cpu rp_kernel_on_cpu_optimized selftest shared status stdout straight terminal thread timer tuningdb usage user_options wordlist
ifeq ($(SYSTEM_LZMA_SDK),0)
OBJS_ALL += lzma_sdk/Alloc lzma_sdk/Lzma2Dec lzma_sdk/LzmaDec
endif
NATIVE_STATIC_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.STATIC.o) NATIVE_STATIC_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.STATIC.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)