# $NetBSD$
-DISTNAME= hashcat-3.30
+DISTNAME= hashcat-3.40
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GITHUB:=hashcat/}
share/hashcat/OpenCL/amp_a0.cl
share/hashcat/OpenCL/amp_a1.cl
share/hashcat/OpenCL/amp_a3.cl
-share/hashcat/OpenCL/inc_cipher_aes256.cl
-share/hashcat/OpenCL/inc_cipher_serpent256.cl
-share/hashcat/OpenCL/inc_cipher_twofish256.cl
+share/hashcat/OpenCL/inc_cipher_aes.cl
+share/hashcat/OpenCL/inc_cipher_serpent.cl
+share/hashcat/OpenCL/inc_cipher_twofish.cl
share/hashcat/OpenCL/inc_common.cl
share/hashcat/OpenCL/inc_comp_multi.cl
share/hashcat/OpenCL/inc_comp_multi_bs.cl
share/hashcat/OpenCL/inc_comp_single_bs.cl
share/hashcat/OpenCL/inc_hash_constants.h
share/hashcat/OpenCL/inc_hash_functions.cl
+share/hashcat/OpenCL/inc_luks_aes.cl
+share/hashcat/OpenCL/inc_luks_af.cl
+share/hashcat/OpenCL/inc_luks_essiv.cl
+share/hashcat/OpenCL/inc_luks_serpent.cl
+share/hashcat/OpenCL/inc_luks_twofish.cl
+share/hashcat/OpenCL/inc_luks_xts.cl
share/hashcat/OpenCL/inc_rp.cl
share/hashcat/OpenCL/inc_rp.h
share/hashcat/OpenCL/inc_simd.cl
share/hashcat/OpenCL/m03800_a0.cl
share/hashcat/OpenCL/m03800_a1.cl
share/hashcat/OpenCL/m03800_a3.cl
+share/hashcat/OpenCL/m03910_a0.cl
+share/hashcat/OpenCL/m03910_a1.cl
+share/hashcat/OpenCL/m03910_a3.cl
+share/hashcat/OpenCL/m04010_a0.cl
+share/hashcat/OpenCL/m04010_a1.cl
+share/hashcat/OpenCL/m04010_a3.cl
+share/hashcat/OpenCL/m04110_a0.cl
+share/hashcat/OpenCL/m04110_a1.cl
+share/hashcat/OpenCL/m04110_a3.cl
share/hashcat/OpenCL/m04310_a0.cl
share/hashcat/OpenCL/m04310_a1.cl
share/hashcat/OpenCL/m04310_a3.cl
share/hashcat/OpenCL/m04500_a0.cl
share/hashcat/OpenCL/m04500_a1.cl
share/hashcat/OpenCL/m04500_a3.cl
+share/hashcat/OpenCL/m04520_a0.cl
+share/hashcat/OpenCL/m04520_a1.cl
+share/hashcat/OpenCL/m04520_a3.cl
share/hashcat/OpenCL/m04700_a0.cl
share/hashcat/OpenCL/m04700_a1.cl
share/hashcat/OpenCL/m04700_a3.cl
share/hashcat/OpenCL/m06900_a0.cl
share/hashcat/OpenCL/m06900_a1.cl
share/hashcat/OpenCL/m06900_a3.cl
+share/hashcat/OpenCL/m07000_a0.cl
+share/hashcat/OpenCL/m07000_a1.cl
+share/hashcat/OpenCL/m07000_a3.cl
share/hashcat/OpenCL/m07100.cl
share/hashcat/OpenCL/m07300_a0.cl
share/hashcat/OpenCL/m07300_a1.cl
share/hashcat/OpenCL/m07500_a0.cl
share/hashcat/OpenCL/m07500_a1.cl
share/hashcat/OpenCL/m07500_a3.cl
-share/hashcat/OpenCL/m07600_a0.cl
-share/hashcat/OpenCL/m07600_a1.cl
-share/hashcat/OpenCL/m07600_a3.cl
share/hashcat/OpenCL/m07700_a0.cl
share/hashcat/OpenCL/m07700_a1.cl
share/hashcat/OpenCL/m07700_a3.cl
share/hashcat/OpenCL/m14400_a0.cl
share/hashcat/OpenCL/m14400_a1.cl
share/hashcat/OpenCL/m14400_a3.cl
+share/hashcat/OpenCL/m14611.cl
+share/hashcat/OpenCL/m14612.cl
+share/hashcat/OpenCL/m14613.cl
+share/hashcat/OpenCL/m14621.cl
+share/hashcat/OpenCL/m14622.cl
+share/hashcat/OpenCL/m14623.cl
+share/hashcat/OpenCL/m14631.cl
+share/hashcat/OpenCL/m14632.cl
+share/hashcat/OpenCL/m14633.cl
+share/hashcat/OpenCL/m14641.cl
+share/hashcat/OpenCL/m14642.cl
+share/hashcat/OpenCL/m14643.cl
+share/hashcat/OpenCL/m14700.cl
+share/hashcat/OpenCL/m14800.cl
+share/hashcat/OpenCL/m14900_a0.cl
+share/hashcat/OpenCL/m14900_a1.cl
+share/hashcat/OpenCL/m14900_a3.cl
+share/hashcat/OpenCL/m15000_a0.cl
+share/hashcat/OpenCL/m15000_a1.cl
+share/hashcat/OpenCL/m15000_a3.cl
share/hashcat/OpenCL/markov_be.cl
share/hashcat/OpenCL/markov_le.cl
share/hashcat/hashcat.hcstat
$NetBSD$
-SHA1 (hashcat-3.30.tar.gz) = 8295ecc0be053aad75f3ef3d25263505e21acb58
-RMD160 (hashcat-3.30.tar.gz) = cfebc1103809155d35d010436b314c069f033a84
-SHA512 (hashcat-3.30.tar.gz) = 8f160a5ec4bd9add83cfc468e9335dcfc9297585180c67263fce18235a8b748f75205fa5bd5ddd1c34efc65569d94408ba98c6181a2b1ab760f33371f92c3c54
-Size (hashcat-3.30.tar.gz) = 3970267 bytes
-SHA1 (patch-src_Makefile) = a9513b22cb28ddeb48b38fcc4cace6c101873cf0
+SHA1 (hashcat-3.40.tar.gz) = a4e3552aeab45a0650084c27fdd9b101768d90d1
+RMD160 (hashcat-3.40.tar.gz) = 07598dc89142ed556990e4e0b99d31a9c848b098
+SHA512 (hashcat-3.40.tar.gz) = 0247cfa703972c0b851b6cf5b62ac4eeefaa34a752ce34d335320c4b273366868a0e4502445dec0db75e9a0b811cd08772a608d1ddfbd9581aa385c0145a8168
+Size (hashcat-3.40.tar.gz) = 4099148 bytes
+SHA1 (patch-src_Makefile) = 630e7a5b422563e14e8eb2fa5a9abef52b1236fa
Add minimal NetBSD support.
Don't override CC nor optimisation flags in CFLAGS.
-Avoid -march=native.
-Fix shared dynamic library handing on Darwin.
+On Darwin, use gsed.
---- src/Makefile.orig 2017-01-06 07:54:39.000000000 +0000
+--- src/Makefile.orig 2017-03-03 14:26:59.000000000 +0000
+++ src/Makefile
-@@ -17,7 +17,7 @@ UNAME := $(patsubst MS
+@@ -21,7 +21,7 @@ UNAME := $(patsubst MS
UNAME := $(patsubst MINGW32_NT-%,MSYS2,$(UNAME))
UNAME := $(patsubst MINGW64_NT-%,MSYS2,$(UNAME))
$(error "! Your Operating System ($(UNAME)) is not supported by this Makefile")
endif
-@@ -52,7 +52,11 @@ DOCUMENT_FOLDER ?= $(PREFIX)/sha
+@@ -56,7 +56,11 @@ DOCUMENT_FOLDER ?= $(PREFIX)/sha
##
HASHCAT_FRONTEND := hashcat
ifeq ($(UNAME),CYGWIN)
HASHCAT_FRONTEND := hashcat.exe
-@@ -76,22 +80,20 @@ OPENCL_HEADERS_KHRONOS := deps/OpenCL-H
+@@ -80,21 +84,14 @@ OPENCL_HEADERS_KHRONOS := deps/OpenCL-H
## Native compiler paths
##
INSTALL := install
RM := rm
SED := sed
+ SED_IN_PLACE := -i
- ifeq ($(UNAME),Darwin)
+-ifeq ($(UNAME),Darwin)
-CC := clang
- SED := gsed
- endif
+-# the sed -i option of OSX requires a parameter for the backup file (we just use "")
+-SED_IN_PLACE := -i ""
+-endif
ifeq ($(UNAME),FreeBSD)
-CC := cc
SED := gsed
endif
-+
- ##
- ## Cross compiler paths
- ##
-@@ -158,16 +160,20 @@ endif
-
+@@ -162,7 +159,6 @@ endif
LFLAGS := $(LDFLAGS)
--ifndef DEBUG
+ ifeq ($(DEBUG),0)
-CFLAGS += -O2
--LFLAGS += -s
--else
-+ifdef DEBUG
- CFLAGS += -DDEBUG -g -ggdb
- ifeq ($(DEBUG),2)
- CFLAGS += -fsanitize=address -fno-omit-frame-pointer
- endif
+ LFLAGS += -s
+ else
+ ifeq ($(DEBUG),1)
+@@ -196,6 +192,13 @@ LFLAGS_NATIVE += -lpthread
endif
+ endif # FreeBSD
+ifeq ($(UNAME),NetBSD)
-+CFLAGS_NATIVE := -D_POSIX
-+CFLAGS_NATIVE += $(CFLAGS)
-+LFLAGS_NATIVE := -lpthread
-+CFLAGS_NATIVE += -DHAVE_HWMON
++CFLAGS_NATIVE := $(CFLAGS)
++CFLAGS_NATIVE += -I$(OPENCL_HEADERS_KHRONOS)/
++LFLAGS_NATIVE := $(LFLAGS)
++LFLAGS_NATIVE += -lpthread
+endif # NetBSD
+
- ##
- ## Native compilation target
- ##
-@@ -175,7 +181,6 @@ endif
- ifeq ($(UNAME),Linux)
- CFLAGS_NATIVE := $(CFLAGS)
- CFLAGS_NATIVE += -I$(OPENCL_HEADERS_KHRONOS)/
--CFLAGS_NATIVE += -march=native
- CFLAGS_NATIVE += -DWITH_HWMON
- LFLAGS_NATIVE := $(LFLAGS)
- LFLAGS_NATIVE += -lpthread -ldl
-@@ -185,7 +190,6 @@ ifeq ($(UNAME),FreeBSD)
- ifndef PORTNAME
- CFLAGS_NATIVE := $(CFLAGS)
- CFLAGS_NATIVE += -I$(OPENCL_HEADERS_KHRONOS)/
--CFLAGS_NATIVE += -march=native
- LFLAGS_NATIVE := $(LFLAGS)
- LFLAGS_NATIVE += -lpthread
- endif
-@@ -194,7 +198,6 @@ endif # FreeBSD
ifeq ($(UNAME),Darwin)
export MACOSX_DEPLOYMENT_TARGET=10.9
CFLAGS_NATIVE := $(CFLAGS)
--CFLAGS_NATIVE += -march=native
- LFLAGS_NATIVE := $(LFLAGS)
- LFLAGS_NATIVE += -framework OpenCL
- LFLAGS_NATIVE += -lpthread
-@@ -227,6 +230,10 @@ endif # MSYS2
- CFLAGS_NATIVE_SHARED := $(CFLAGS_NATIVE)
- CFLAGS_NATIVE_SHARED += -fpic
- LFLAGS_NATIVE_SHARED := $(LFLAGS_NATIVE)
-+ifeq ($(UNAME),Darwin)
-+LFLAGS_NATIVE_SHARED += -dylib
-+LFLAGS_NATIVE_SHARED += -install_name $(DESTDIR)$(LIBRARY_FOLDER)/$(HASHCAT_LIBRARY)
-+endif
-
- ##
- ## Cross compilation targets
-@@ -388,7 +395,7 @@ $(HASHCAT_LIBRARY): $(NATIVE_SHARED_OBJS
- $(CC) -o $@ $^ $(LFLAGS_NATIVE_SHARED) -shared
-
- $(HASHCAT_FRONTEND): $(NATIVE_OBJS) $(HASHCAT_LIBRARY) src/main.c
-- $(CC) $(CFLAGS_NATIVE) -o $@ $^ $(LFLAGS_NATIVE) -L. -lhashcat -Wl,-rpath . -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
-+ $(CC) $(CFLAGS_NATIVE) -o $@ $^ $(LFLAGS_NATIVE) -L. -lhashcat -Wl,-rpath=. -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
-
- ##
- ## cross compiled hashcat