Merge pull request hashcat#58 from matrix/combinatorX

Added combinatorX, version 1.0
Mksjsb · Aug 11, 2021 · c7018f3 · c7018f3
2 parents 234feea + 0d3ed7b
commit c7018f3
Show file tree

Hide file tree

Showing 3 changed files with 1,105 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.bin
 *.exe
+*.dSYM
 bin/
diff --git a/src/Makefile b/src/Makefile
@@ -2,7 +2,33 @@
 ##  Makefile
 ##
 
-CFLAGS += -Wall -W -pipe -O2 -std=gnu99
+DEBUG                   := 0
+
+CFLAGS                  += -Wall -W -pipe -std=gnu99
+
+ifeq ($(DEBUG),0)
+CFLAGS                  += -O2
+ifneq ($(UNAME),Darwin)
+LFLAGS                  += -s
+endif
+else
+ifeq ($(DEBUG),1)
+ifneq ($(UNAME),Darwin)
+CFLAGS                  += -DDEBUG -Og -ggdb
+else
+CFLAGS                  += -DDEBUG -O0 -ggdb
+endif
+else
+ifeq ($(DEBUG),2)
+ifneq ($(UNAME),Darwin)
+CFLAGS                  += -DDEBUG -Og -ggdb
+else
+CFLAGS                  += -DDEBUG -O0 -ggdb
+endif
+CFLAGS                  += -fsanitize=address -fno-omit-frame-pointer
+endif
+endif
+endif
 
 all: clean native
 
@@ -16,6 +42,7 @@ release: native windows
 clean:
 	rm -f ../bin/*
 	rm -f *.bin *.exe
+	rm -rf *.dSYM
 
 ##
 ## native
@@ -32,6 +59,7 @@ native:
 	${CC_NATIVE} ${CFLAGS_NATIVE} ${LDFLAGS_NATIVE} -o cleanup-rules.bin cleanup-rules.c
 	${CC_NATIVE} ${CFLAGS_NATIVE} ${LDFLAGS_NATIVE} -o combinator.bin combinator.c
 	${CC_NATIVE} ${CFLAGS_NATIVE} ${LDFLAGS_NATIVE} -o combinator3.bin combinator3.c
+	${CC_NATIVE} ${CFLAGS_NATIVE} ${LDFLAGS_NATIVE} -o combinatorX.bin combinatorX.c
 	${CC_NATIVE} ${CFLAGS_NATIVE} ${LDFLAGS_NATIVE} -o combipow.bin combipow.c
 	${CC_NATIVE} ${CFLAGS_NATIVE} ${LDFLAGS_NATIVE} -o ct3_to_ntlm.bin ct3_to_ntlm.c
 	${CC_NATIVE} ${CFLAGS_NATIVE} ${LDFLAGS_NATIVE} -o cutb.bin cutb.c
@@ -70,6 +98,7 @@ windows:
 	${CC_WINDOWS} ${CFLAGS_WINDOWS} -o cleanup-rules.exe cleanup-rules.c
 	${CC_WINDOWS} ${CFLAGS_WINDOWS} -o combinator.exe combinator.c
 	${CC_WINDOWS} ${CFLAGS_WINDOWS} -o combinator3.exe combinator3.c
+	${CC_WINDOWS} ${CFLAGS_WINDOWS} -o combinatorX.exe combinatorX.c
 	${CC_WINDOWS} ${CFLAGS_WINDOWS} -o combipow.exe combipow.c
 	${CC_WINDOWS} ${CFLAGS_WINDOWS} -o ct3_to_ntlm.exe ct3_to_ntlm.c
 	${CC_WINDOWS} ${CFLAGS_WINDOWS} -o cutb.exe cutb.c
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     *.bin
     *.exe
+    *.dSYM
     bin/