arno
/
hashcat
mirror of https://github.com/hashcat/hashcat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove some (hopefully) redundant macros and compiler options

Browse Source
pull/496/head
jsteube 8 years ago
parent 80d7dce9b5
commit 25726e4f4e
10 changed files with 58 additions and 67 deletions
Show Stats Download Patch File Download Diff File

2
include/common.h
Unescape View File

@ -8,10 +8,8 @@
#ifndef _COMMON_H
#define _COMMON_H
#define _POSIX_SOURCE
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
#define _CRT_SECURE_NO_WARNINGS
#define EXEC_CACHE 128

2
include/ext_OpenCL.h
Unescape View File

@ -15,7 +15,7 @@
#include <OpenCL/cl.h>
#endif
#ifdef WIN
#ifdef _WIN
#include <CL/cl.h>
#endif

3
include/shared.h
Unescape View File

@ -14,6 +14,7 @@
#include <unistd.h>
#include <signal.h>
#include <fcntl.h>
#include <inttypes.h>
/**
* OS specific includes
@ -147,7 +148,7 @@ void write_restore (const char *new_restore_file, restore_data_t *rd)
void cycle_restore (void);
void check_checkpoint (void);
#ifdef WIN
#ifdef _WIN
BOOL WINAPI sigHandler_default (DWORD sig);
BOOL WINAPI sigHandler_benchmark (DWORD sig);

21
src/Makefile
Unescape View File

@ -94,7 +94,7 @@ VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=
## Compiler flags
##
CFLAGS += -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/
CFLAGS += -pipe -W -Wall -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/
ifndef DEBUG
CFLAGS += -O2
@ -148,7 +148,8 @@ endif
CFLAGS_CROSS_LINUX += $(CFLAGS)
CFLAGS_CROSS_LINUX += -DHAVE_HWMON
CFLAGS_CROSS_WIN := -D_WIN -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1
#CFLAGS_CROSS_WIN := -D_WIN -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1
CFLAGS_CROSS_WIN := -D_WIN
ifndef DEBUG
CFLAGS_CROSS_WIN += -s
endif
@ -272,25 +273,25 @@ hashcat: src/hashcat.c $(NATIVE_OBJS)
##
obj/%.LINUX.32.o: src/%.c
$(CC_LINUX_32) -D_LINUX32 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -c -o $@ $<
$(CC_LINUX_32) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -c -o $@ $<
obj/%.LINUX.64.o: src/%.c
$(CC_LINUX_64) -D_LINUX64 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -c -o $@ $<
$(CC_LINUX_64) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -c -o $@ $<
obj/%.WIN.32.o: src/%.c
$(CC_WIN_32) -D_WIN32 $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -c -o $@ $<
$(CC_WIN_32) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -c -o $@ $<
obj/%.WIN.64.o: src/%.c
$(CC_WIN_64) -D_WIN64 $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -c -o $@ $<
$(CC_WIN_64) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -c -o $@ $<
hashcat32.bin: src/hashcat.c $(LINUX_32_OBJS)
$(CC_LINUX_32) -D_LINUX32 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -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)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
hashcat64.bin: src/hashcat.c $(LINUX_64_OBJS)
$(CC_LINUX_64) -D_LINUX64 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -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)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
hashcat32.exe: src/hashcat.c $(WIN_32_OBJS)
$(CC_WIN_32) -D_WIN32 $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -static-libgcc
$(CC_WIN_32) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\"
hashcat64.exe: src/hashcat.c $(WIN_64_OBJS)
$(CC_WIN_64) -D_WIN64 $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -static-libgcc
$(CC_WIN_64) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\"

2
src/ext_OpenCL.c
Unescape View File

@ -91,7 +91,7 @@ int ocl_init (OCL_PTR *ocl)
log_info ("You're probably missing the \"ocl-icd-libopencl1\" package (Debian/Ubuntu)");
log_info (" sudo apt-get install ocl-icd-libopencl1");
log_info ("");
#elif defined (WIN)
#elif defined (_WIN)
log_info ("You're probably missing the OpenCL runtime installation");
log_info (" AMD users require AMD drivers 14.9 or later (recommended 15.12 or later)");
log_info (" Intel users require Intel OpenCL Runtime 14.2 or later (recommended 15.1 or later)");

8
src/folder.c
Unescape View File

@ -24,7 +24,7 @@ char *get_exec_path ()
char *exec_path = (char *) mymalloc (exec_path_len);
#ifdef __linux__
#if defined (__linux__)
char tmp[32] = { 0 };
@ -32,11 +32,11 @@ char *get_exec_path ()
const int len = readlink (tmp, exec_path, exec_path_len - 1);
#elif WIN
#elif defined (_WIN)
const int len = GetModuleFileName (NULL, exec_path, exec_path_len - 1);
#elif __APPLE__
#elif defined (__APPLE__)
uint size = exec_path_len;
@ -49,7 +49,7 @@ char *get_exec_path ()
const int len = strlen (exec_path);
#elif __FreeBSD__
#elif defined (__FreeBSD__)
int mib[4];
mib[0] = CTL_KERN;

69
src/hashcat.c
Unescape View File

@ -18,6 +18,7 @@
#include <unistd.h>
#include <search.h>
#include <getopt.h>
#include <inttypes.h>
#ifdef _POSIX
#include <pthread.h>
@ -585,7 +586,7 @@ void status_display_machine_readable ()
speed_cnt /= SPEED_CACHE;
speed_ms /= SPEED_CACHE;
fprintf (out, "%llu\t%f\t", (unsigned long long int) speed_cnt, speed_ms);
fprintf (out, "%" PRIu64 "\t%f\t", speed_cnt, speed_ms);
}
/**
@ -611,7 +612,7 @@ void status_display_machine_readable ()
u64 words_cur = get_lowest_words_done ();
fprintf (out, "CURKU\t%llu\t", (unsigned long long int) words_cur);
fprintf (out, "CURKU\t%" PRIu64 "\t", words_cur);
/**
* counter
@ -656,7 +657,7 @@ void status_display_machine_readable ()
u64 progress_cur_relative_skip = progress_cur - progress_skip;
u64 progress_end_relative_skip = progress_end - progress_skip;
fprintf (out, "PROGRESS\t%llu\t%llu\t", (unsigned long long int) progress_cur_relative_skip, (unsigned long long int) progress_end_relative_skip);
fprintf (out, "PROGRESS\t%" PRIu64 "\t%" PRIu64 "\t", progress_cur_relative_skip, progress_end_relative_skip);
/**
* cracks
@ -1062,7 +1063,7 @@ void status_display ()
ms_paused += ms_paused_tmp;
}
#ifdef WIN
#ifdef _WIN
__time64_t sec_run = (__time64_t) ms_running / 1000;
@ -1080,7 +1081,7 @@ void status_display ()
struct tm *tmp = NULL;
#ifdef WIN
#ifdef _WIN
tmp = _gmtime64 (&sec_run);
@ -1175,7 +1176,7 @@ void status_display ()
{
if (data.devices_status != STATUS_CRACKED)
{
#ifdef WIN
#ifdef _WIN
__time64_t sec_etc = 0;
#else
time_t sec_etc = 0;
@ -1208,7 +1209,7 @@ void status_display ()
struct tm *tmp = NULL;
#ifdef WIN
#ifdef _WIN
tmp = _gmtime64 (&sec_etc);
#else
tmp = gmtime (&sec_etc);
@ -1239,7 +1240,7 @@ void status_display ()
time (&runtime_cur);
#ifdef WIN
#ifdef _WIN
__time64_t runtime_left = data.proc_start + data.runtime + data.prepare_time + (ms_paused / 1000) - runtime_cur;
@ -1342,7 +1343,7 @@ void status_display ()
if ((data.cpt_start + 86400) < now)
{
log_info ("Recovered/Time.: CUR:%llu,%llu,%llu AVG:%0.2f,%0.2f,%0.2f (Min,Hour,Day)",
log_info ("Recovered/Time.: CUR:%" PRIu64 ",%" PRIu64 ",%" PRIu64 " AVG:%0.2f,%0.2f,%0.2f (Min,Hour,Day)",
cpt_cur_min,
cpt_cur_hour,
cpt_cur_day,
@ -1352,7 +1353,7 @@ void status_display ()
}
else if ((data.cpt_start + 3600) < now)
{
log_info ("Recovered/Time.: CUR:%llu,%llu,N/A AVG:%0.2f,%0.2f,%0.2f (Min,Hour,Day)",
log_info ("Recovered/Time.: CUR:%" PRIu64 ",%" PRIu64 ",N/A AVG:%0.2f,%0.2f,%0.2f (Min,Hour,Day)",
cpt_cur_min,
cpt_cur_hour,
cpt_avg_min,
@ -1361,7 +1362,7 @@ void status_display ()
}
else if ((data.cpt_start + 60) < now)
{
log_info ("Recovered/Time.: CUR:%llu,N/A,N/A AVG:%0.2f,%0.2f,%0.2f (Min,Hour,Day)",
log_info ("Recovered/Time.: CUR:%" PRIu64 ",N/A,N/A AVG:%0.2f,%0.2f,%0.2f (Min,Hour,Day)",
cpt_cur_min,
cpt_avg_min,
cpt_avg_hour,
@ -1398,14 +1399,14 @@ void status_display ()
percent_rejected = (double) (all_rejected) / (double) progress_cur;
}
log_info ("Progress.......: %llu/%llu (%.02f%%)", (unsigned long long int) progress_cur_relative_skip, (unsigned long long int) progress_end_relative_skip, percent_finished * 100);
log_info ("Rejected.......: %llu/%llu (%.02f%%)", (unsigned long long int) all_rejected, (unsigned long long int) progress_cur_relative_skip, percent_rejected * 100);
log_info ("Progress.......: %" PRIu64 "/%" PRIu64 " (%.02f%%)", progress_cur_relative_skip, progress_end_relative_skip, percent_finished * 100);
log_info ("Rejected.......: %" PRIu64 "/%" PRIu64 " (%.02f%%)", all_rejected, progress_cur_relative_skip, percent_rejected * 100);
if (data.restore_disable == 0)
{
if (percent_finished != 1)
{
log_info ("Restore.Point..: %llu/%llu (%.02f%%)", (unsigned long long int) restore_point, (unsigned long long int) restore_total, percent_restore * 100);
log_info ("Restore.Point..: %" PRIu64 "/%" PRIu64 " (%.02f%%)", restore_point, restore_total, percent_restore * 100);
}
}
}
@ -1414,24 +1415,24 @@ void status_display ()
{
if ((data.wordlist_mode == WL_MODE_FILE) || (data.wordlist_mode == WL_MODE_MASK))
{
log_info ("Progress.......: %llu/%llu (%.02f%%)", 0ull, 0ull, 100);
log_info ("Rejected.......: %llu/%llu (%.02f%%)", 0ull, 0ull, 100);
log_info ("Progress.......: %" PRIu64 "/%" PRIu64 " (%.02f%%)", 0ull, 0ull, 100);
log_info ("Rejected.......: %" PRIu64 "/%" PRIu64 " (%.02f%%)", 0ull, 0ull, 100);
if (data.restore_disable == 0)
{
log_info ("Restore.Point..: %llu/%llu (%.02f%%)", 0ull, 0ull, 100);
log_info ("Restore.Point..: %" PRIu64 "/%" PRIu64 " (%.02f%%)", 0ull, 0ull, 100);
}
}
else
{
log_info ("Progress.......: %llu", (unsigned long long int) progress_cur_relative_skip);
log_info ("Rejected.......: %llu", (unsigned long long int) all_rejected);
log_info ("Progress.......: %" PRIu64 "", progress_cur_relative_skip);
log_info ("Rejected.......: %" PRIu64 "", all_rejected);
// --restore not allowed if stdin is used -- really? why?
//if (data.restore_disable == 0)
//{
// log_info ("Restore.Point..: %llu", (unsigned long long int) restore_point);
// log_info ("Restore.Point..: %" PRIu64 "", restore_point);
//}
}
}
@ -1567,7 +1568,7 @@ static void status_benchmark_automate ()
if (device_param->skipped) continue;
log_info ("%u:%u:%llu", device_id + 1, data.hash_mode, (unsigned long long int) (hashes_dev_ms[device_id] * 1000));
log_info ("%u:%u:%" PRIu64 "", device_id + 1, data.hash_mode, (hashes_dev_ms[device_id] * 1000));
}
}
@ -4215,7 +4216,7 @@ static u64 count_words (wl_data_t *wl_data, FILE *fd, char *dictfile, dictstat_t
keyspace *= data.combs_cnt;
}
if (data.quiet == 0) log_info ("Cache-hit dictionary stats %s: %llu bytes, %llu words, %llu keyspace", dictfile, (unsigned long long int) d.stat.st_size, (unsigned long long int) cnt, (unsigned long long int) keyspace);
if (data.quiet == 0) log_info ("Cache-hit dictionary stats %s: %" PRIu64 " bytes, %" PRIu64 " words, %" PRIu64 " keyspace", dictfile, d.stat.st_size, cnt, keyspace);
if (data.quiet == 0) log_info ("");
hc_signal (sigHandler_default);
@ -4292,12 +4293,12 @@ static u64 count_words (wl_data_t *wl_data, FILE *fd, char *dictfile, dictstat_t
double percent = (double) comp / (double) d.stat.st_size;
if (data.quiet == 0) log_info_nn ("Generating dictionary stats for %s: %llu bytes (%.2f%%), %llu words, %llu keyspace", dictfile, (unsigned long long int) comp, percent * 100, (unsigned long long int) cnt2, (unsigned long long int) cnt);
if (data.quiet == 0) log_info_nn ("Generating dictionary stats for %s: %" PRIu64 " bytes (%.2f%%), %" PRIu64 " words, %" PRIu64 " keyspace", dictfile, comp, percent * 100, cnt2, cnt);
time (&prev);
}
if (data.quiet == 0) log_info ("Generated dictionary stats for %s: %llu bytes, %llu words, %llu keyspace", dictfile, (unsigned long long int) comp, (unsigned long long int) cnt2, (unsigned long long int) cnt);
if (data.quiet == 0) log_info ("Generated dictionary stats for %s: %" PRIu64 " bytes, %" PRIu64 " words, %" PRIu64 " keyspace", dictfile, comp, cnt2, cnt);
if (data.quiet == 0) log_info ("");
lsearch (&d, dictstat_base, dictstat_nmemb, sizeof (dictstat_t), sort_by_dictstat);
@ -4527,7 +4528,7 @@ static void *thread_monitor (void *p)
}
else if (device_param->device_vendor_id == VENDOR_ID_NV)
{
#ifdef WIN
#ifdef _WIN
hm_set_fanspeed_with_device_id_nvapi (device_id, fan_speed_new, 1);
#endif
@ -5965,7 +5966,7 @@ static uint generate_bitmaps (const uint digests_cnt, const uint dgst_size, cons
* main
*/
#ifdef WIN
#ifdef _WIN
static void SetConsoleWindowSize (const int x)
{
HANDLE h = GetStdHandle (STD_OUTPUT_HANDLE);
@ -5993,7 +5994,7 @@ static void SetConsoleWindowSize (const int x)
int main (int argc, char **argv)
{
#ifdef WIN
#ifdef _WIN
SetConsoleWindowSize (132);
#endif
@ -7501,8 +7502,8 @@ int main (int argc, char **argv)
#define logfile_top_msg(msg) logfile_append ("%s\t%s", data.topid, (msg));
#define logfile_sub_msg(msg) logfile_append ("%s\t%s\t%s", data.topid, data.subid, (msg));
#define logfile_top_var_uint64(var,val) logfile_append ("%s\t%s\t%llu", data.topid, (var), (val));
#define logfile_sub_var_uint64(var,val) logfile_append ("%s\t%s\t%s\t%llu", data.topid, data.subid, (var), (val));
#define logfile_top_var_uint64(var,val) logfile_append ("%s\t%s\t%" PRIu64 "", data.topid, (var), (val));
#define logfile_sub_var_uint64(var,val) logfile_append ("%s\t%s\t%s\t%" PRIu64 "", data.topid, data.subid, (var), (val));
#define logfile_top_var_uint(var,val) logfile_append ("%s\t%s\t%u", data.topid, (var), (val));
#define logfile_sub_var_uint(var,val) logfile_append ("%s\t%s\t%s\t%u", data.topid, data.subid, (var), (val));
#define logfile_top_var_char(var,val) logfile_append ("%s\t%s\t%c", data.topid, (var), (val));
@ -14841,7 +14842,7 @@ int main (int argc, char **argv)
need_xnvctrl = 1;
#endif
#ifdef WIN
#ifdef _WIN
need_nvapi = 1;
#endif
}
@ -15859,7 +15860,7 @@ int main (int argc, char **argv)
return -1;
}
if (quiet == 0) log_info ("SCRYPT tmto optimizer value set to: %u, mem: %llu\n", data.scrypt_tmto_final, (unsigned long long int) size_scrypt);
if (quiet == 0) log_info ("SCRYPT tmto optimizer value set to: %u, mem: %" PRIu64 "\n", data.scrypt_tmto_final, size_scrypt);
}
size_t size_scrypt4 = size_scrypt / 4;
@ -17613,7 +17614,7 @@ int main (int argc, char **argv)
rc = set_fan_control (data.hm_xnvctrl, data.hm_device[device_id].xnvctrl, NV_CTRL_GPU_COOLER_MANUAL_CONTROL_TRUE);
#endif
#ifdef WIN
#ifdef _WIN
rc = hm_set_fanspeed_with_device_id_nvapi (device_id, fanspeed, 1);
#endif
}
@ -19369,7 +19370,7 @@ int main (int argc, char **argv)
if (keyspace == 1)
{
log_info ("%llu", (unsigned long long int) words_base);
log_info ("%" PRIu64 "", words_base);
return 0;
}
@ -19885,7 +19886,7 @@ int main (int argc, char **argv)
rc = set_fan_control (data.hm_xnvctrl, data.hm_device[device_id].xnvctrl, NV_CTRL_GPU_COOLER_MANUAL_CONTROL_FALSE);
#endif
#ifdef WIN
#ifdef _WIN
rc = hm_set_fanspeed_with_device_id_nvapi (device_id, 100, 0);
#endif
}

2
src/hwmon.c
Unescape View File

@ -233,7 +233,7 @@ u32 *hm_get_list_valid_adl_adapters (int iNumberAdapters, int *num_adl_adapters,
if (strlen (info.strUDID) < 1) continue;
#ifdef WIN
#ifdef _WIN
if (info.iVendorID != 1002) continue;
#else
if (info.iVendorID != 0x1002) continue;

14
src/shared.c
Unescape View File

@ -609,17 +609,7 @@ void format_output (FILE *out_fp, char *out_buf, unsigned char *plain_ptr, const
if (outfile_format & OUTFILE_FMT_CRACKPOS)
{
#ifdef _WIN
__mingw_fprintf (out_fp, "%llu", crackpos);
#endif
#ifdef _POSIX
#ifdef __x86_64__
fprintf (out_fp, "%lu", (unsigned long) crackpos);
#else
fprintf (out_fp, "%llu", crackpos);
#endif
#endif
fprintf (out_fp, "%" PRIu64, crackpos);
}
fputs (EOL, out_fp);
@ -1406,7 +1396,7 @@ void check_checkpoint ()
* parallel running threads
*/
#ifdef WIN
#ifdef _WIN
BOOL WINAPI sigHandler_default (DWORD sig)
{

2
src/terminal.c
Unescape View File

@ -104,7 +104,7 @@ int tty_fix()
}
#endif
#ifdef WIN
#ifdef _WIN
static DWORD saveMode = 0;
int tty_break()

Write Preview
Loading…
Cancel
Save