arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-20 11:32:12 +00:00
Code Issues Releases Wiki Activity

Expanded version information as discussed in https://github.com/hashcat/oclHashcat/issues/138

Browse Source
This commit is contained in:
Jens Steube 2016-01-21 10:17:22 +01:00
parent 811afddeda
commit bfc4495bd3
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changes.txt
View File

@ -91,6 +91,11 @@ File.: Host
Desc.: Renamed option --gpu-devices to --opencl-devices Desc.: Renamed option --gpu-devices to --opencl-devices
Issue: 2 Issue: 2
Type.: Change
File.: Host
Desc.: Expanded version information
Issue: 138
Type.: Change Type.: Change
File.: Host File.: Host
Desc.: Stick to older libOpenCL to avoid errors like this: version `OPENCL_2.0' not found Desc.: Stick to older libOpenCL to avoid errors like this: version `OPENCL_2.0' not found

6
include/shared.h
View File

@ -131,9 +131,6 @@ typedef pthread_mutex_t hc_thread_mutex_t;
* valid project specific global stuff * valid project specific global stuff
*/ */
extern const char *PROGNAME;
extern const char *VERSION_TXT;
extern const uint VERSION_BIN; extern const uint VERSION_BIN;
extern const uint RESTORE_MIN; extern const uint RESTORE_MIN;
@ -144,9 +141,6 @@ extern const char *PROMPT;
extern int SUPPRESS_OUTPUT; extern int SUPPRESS_OUTPUT;
extern hc_thread_mutex_t mux_adl;
extern hc_thread_mutex_t mux_counter;
extern hc_thread_mutex_t mux_dispatcher;
extern hc_thread_mutex_t mux_display; extern hc_thread_mutex_t mux_display;
/** /**

14
src/Makefile
View File

@ -114,7 +114,9 @@ DLL_WIN_64 := x86_64-w64-mingw32-dlltool
## Misc stuff ## Misc stuff
## ##
NOW := $(shell date +%s) COMPTIME := $(shell date +%s)
VERSION_TAG := $(shell git describe --tags --dirty=+ | cut -d- -f1)
VERSION_SUM := $(shell git describe --tags --dirty=+ | cut -d- -f3)
## ##
## Compiler flags ## Compiler flags
@ -321,7 +323,7 @@ obj/%.NATIVE.o: src/%.c
$(CC_NATIVE) $(CFLAGS_NATIVE) -c -o $@ $< $(CC_NATIVE) $(CFLAGS_NATIVE) -c -o $@ $<
oclHashcat: src/oclHashcat.c $(NATIVE_OBJS) oclHashcat: src/oclHashcat.c $(NATIVE_OBJS)
$(CC_NATIVE) $(CFLAGS_NATIVE) -o $(BINARY_NATIVE) $^ $(LFLAGS_NATIVE) -DCOMPTIME=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" $(CC_NATIVE) $(CFLAGS_NATIVE) -o $(BINARY_NATIVE) $^ $(LFLAGS_NATIVE) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\"=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
## ##
## cross compiled oclHashcat for binary release version ## cross compiled oclHashcat for binary release version
@ -340,13 +342,13 @@ obj/%.WIN.64.o: src/%.c
$(CC_WIN_64) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -c -o $@ $< $(CC_WIN_64) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -c -o $@ $<
oclHashcat32.bin: src/oclHashcat.c $(LINUX_32_OBJS) oclHashcat32.bin: src/oclHashcat.c $(LINUX_32_OBJS)
$(CC_LINUX_32) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" $(CC_LINUX_32) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\"=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
oclHashcat64.bin: src/oclHashcat.c $(LINUX_64_OBJS) oclHashcat64.bin: src/oclHashcat.c $(LINUX_64_OBJS)
$(CC_LINUX_64) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" $(CC_LINUX_64) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\"=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
oclHashcat32.exe: src/oclHashcat.c $(WIN_32_OBJS) lib/libOpenCL.a oclHashcat32.exe: src/oclHashcat.c $(WIN_32_OBJS) lib/libOpenCL.a
$(CC_WIN_32) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(NOW) -static-libgcc $(CC_WIN_32) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\"=$(NOW) -static-libgcc
oclHashcat64.exe: src/oclHashcat.c $(WIN_64_OBJS) lib/libOpenCL64.a oclHashcat64.exe: src/oclHashcat.c $(WIN_64_OBJS) lib/libOpenCL64.a
$(CC_WIN_64) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(NOW) -static-libgcc $(CC_WIN_64) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\"=$(NOW) -static-libgcc

9
src/oclHashcat.c
View File

@ -13,7 +13,6 @@
#include <getopt.h> #include <getopt.h>
const char *PROGNAME = "oclHashcat"; const char *PROGNAME = "oclHashcat";
const char *VERSION_TXT = "2.10";
const uint VERSION_BIN = 210; const uint VERSION_BIN = 210;
const uint RESTORE_MIN = 210; const uint RESTORE_MIN = 210;
@ -5383,7 +5382,7 @@ int main (int argc, char **argv)
if (version) if (version)
{ {
log_info (VERSION_TXT); log_info ("%s (%s)", VERSION_TAG, VERSION_SUM);
return (0); return (0);
} }
@ -5688,19 +5687,19 @@ int main (int argc, char **argv)
{ {
if (benchmark == 1) if (benchmark == 1)
{ {
log_info ("%s v%.2f starting in benchmark-mode...", PROGNAME, (float) VERSION_BIN / 100); log_info ("%s %s (%s) starting in benchmark-mode...", PROGNAME, VERSION_TAG, VERSION_SUM);
log_info (""); log_info ("");
} }
else if (restore == 1) else if (restore == 1)
{ {
log_info ("%s v%.2f starting in restore-mode...", PROGNAME, (float) VERSION_BIN / 100); log_info ("%s %s (%s) starting in restore-mode...", PROGNAME, VERSION_TAG, VERSION_SUM);
log_info (""); log_info ("");
} }
else else
{ {
log_info ("%s v%.2f starting...", PROGNAME, (float) VERSION_BIN / 100); log_info ("%s %s (%s) starting...", PROGNAME, VERSION_TAG, VERSION_SUM);
log_info (""); log_info ("");
} }