X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=include%2Fcommon.h;h=c36a3e029adb85be56014ecdfb1658960cf4c48f;hb=161a6eb4bc643d8e636e96eda613f5137d30da59;hp=23d8c32ab410f017ff52a32a10163a53206ffa4b;hpb=63e06f582b830e51ab652d77206f97bee1fb2643;p=hashcat.git

diff --git a/include/common.h b/include/common.h
index 23d8c32..c36a3e0 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,5 +1,7 @@
 /**
- * Author......: Jens Steube <jens.steube@gmail.com>
+ * Authors.....: Jens Steube <jens.steube@gmail.com>
+ *               magnum <john.magnum@hushmail.com>
+ *
  * License.....: MIT
  */
 
@@ -28,6 +30,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <search.h>
+#include <fcntl.h>
 
 #ifdef _POSIX
 #include <sys/time.h>
@@ -35,19 +38,39 @@
 #include <semaphore.h>
 #include <dlfcn.h>
 #include <pwd.h>
+#include <limits.h>
 
-#ifdef LINUX
-#include <termio.h>
+#ifdef __linux__
+#include <termios.h>
+#include <sys/ioctl.h>
 #endif
 
-#ifdef OSX
+#ifdef __APPLE__
 #include <termios.h>
 #include <sys/ioctl.h>
+#include <mach-o/dyld.h>
+#include <mach/mach.h>
 #endif
 
-typedef void *HM_LIB;
+#ifdef __FreeBSD__
+#include <termios.h>
+#include <sys/ioctl.h>
+#endif
+
+typedef void *OCL_LIB;
+
+#ifdef HAVE_HWMON
+typedef void *ADL_LIB;
+typedef void *NVAPI_LIB;
+typedef void *NVML_LIB;
+typedef void *XNVCTRL_LIB;
+#ifdef __APPLE__
+#define __stdcall
+#endif
 #endif
 
+#endif // _POSIX
+
 #ifdef _WIN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -56,7 +79,6 @@ typedef void *HM_LIB;
 #include <tchar.h>
 #include <psapi.h>
 #include <io.h>
-#include <fcntl.h>
 
 typedef UINT8  uint8_t;
 typedef UINT16 uint16_t;
@@ -70,11 +92,18 @@ typedef INT64  int64_t;
 typedef UINT32 uint;
 typedef UINT64 uint64_t;
 
-typedef HINSTANCE HM_LIB;
+typedef HINSTANCE OCL_LIB;
+
+#ifdef HAVE_HWMON
+typedef HINSTANCE ADL_LIB;
+typedef HINSTANCE NVAPI_LIB;
+typedef HINSTANCE NVML_LIB;
+typedef HINSTANCE XNVCTRL_LIB;
+#endif
 
 #define mkdir(name,mode) mkdir (name)
 
-#endif
+#endif // _WIN
 
 typedef uint8_t  u8;
 typedef uint16_t u16;
@@ -83,25 +112,30 @@ typedef uint64_t u64;
 
 typedef uint32_t uint; // we need to get rid of this sooner or later, for consistency
 
-#define SPEED_CACHE  128
-#define SPEED_MAXAGE 4096
+#define EXEC_CACHE    128
 
-#undef  BUFSIZ
-#define BUFSIZ 8192
+#define SPEED_CACHE   128
+#define SPEED_MAXAGE  4096
+
+#define HCBUFSIZ      0x50000 // general large space buffer size in case the size is unknown at compile-time
+
+#define EXPECTED_ITERATIONS 10000
 
 /**
  * functions
  */
 
-void log_out_nn (FILE *fp, const char *fmt, ...);
-void log_info_nn (const char *fmt, ...);
-void log_error_nn (const char *fmt, ...);
+int log_out_nn (FILE *fp, const char *fmt, ...);
+int log_info_nn (const char *fmt, ...);
+int log_error_nn (const char *fmt, ...);
 
-void log_out (FILE *fp, const char *fmt, ...);
-void log_info (const char *fmt, ...);
-void log_error (const char *fmt, ...);
+int log_out (FILE *fp, const char *fmt, ...);
+int log_info (const char *fmt, ...);
+int log_error (const char *fmt, ...);
 
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
 #define MAX(a,b) (((a) > (b)) ? (a) : (b))
 
-#endif
+#define CEIL(a) ((a - (int) (a)) > 0 ? a + 1 : a)
+
+#endif // COMMON_H