arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-26 01:50:10 +00:00
Code Issues Releases Wiki Activity

Fix multiple build issues with OSX

Browse Source
This commit is contained in:
Gabriele 'matrix' Gristina 2016-09-06 22:25:54 +02:00
parent 3ed4bfd237
commit b0c6eee06c
12 changed files with 77 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/folder.h
View File

@ -1,16 +1,19 @@
/**
* Authors.....: Jens Steube <jens.steube@gmail.com>
* Gabriele Gristina <matrix@hashcat.net>
*
* License.....: MIT
*/
#pragma once
#include <stdio.h>
#include <unistd.h>
#ifdef _POSIX
#include <sys/types.h>
#endif
#ifdef __APPLE__
#include <mach-o/dyld.h>
#endif // __APPLE__
#endif // _POSIX
#ifdef _WIN
#include <windows.h>

2
include/shared.h
View File

@ -27,7 +27,9 @@
#include <limits.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#ifndef __APPLE__
#include <sys/sysctl.h>
#endif // __APPLE__
#endif // _POSIX
#ifdef __APPLE__

7
include/terminal.h
View File

@ -1,5 +1,7 @@
/**
* Author......: Jens Steube <jens.steube@gmail.com>
* Authors.....: Jens Steube <jens.steube@gmail.com>
* Gabriele Gristina <matrix@hashcat.net>
*
* License.....: MIT
*/
@ -13,6 +15,9 @@
#ifdef _POSIX
#include <termios.h>
#ifdef __APPLE__
#include <sys/ioctl.h>
#endif // __APPLE__
#endif // _POSIX
#ifdef _WIN

5
include/types.h
View File

@ -1,5 +1,7 @@
/**
* Author......: Jens Steube <jens.steube@gmail.com>
* Authors.....: Jens Steube <jens.steube@gmail.com>
* Gabriele Gristina <matrix@hashcat.net>
*
* License.....: MIT
*/
@ -9,6 +11,7 @@
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#ifdef _WIN
#define EOL "\r\n"

11
src/folder.c
View File

@ -1,12 +1,23 @@
/**
* Authors.....: Jens Steube <jens.steube@gmail.com>
* Gabriele Gristina <matrix@hashcat.net>
*
* License.....: MIT
*/
#ifdef __APPLE__
#include <stdio.h>
#endif
#include "common.h"
#include "memory.h"
#include "folder.h"
#ifdef __APPLE__
#include "types_int.h"
#include "logging.h"
#endif
char *get_exec_path ()
{
int exec_path_len = 1024;

9
src/hashcat.c
View File

@ -6,6 +6,11 @@
* License.....: MIT
*/
#ifdef __APPLE__
#include <stdio.h>
#include <string.h>
#endif
#include "common.h"
#include "types_int.h"
#include "types.h"
@ -14101,9 +14106,11 @@ int main (int argc, char **argv)
*/
int need_adl = 0;
int need_nvapi = 0;
int need_nvml = 0;
#ifndef __APPLE__
int need_nvapi = 0;
int need_xnvctrl = 0;
#endif
hc_device_param_t *devices_param = (hc_device_param_t *) mycalloc (DEVICES_MAX, sizeof (hc_device_param_t));

8
src/hwmon.c
View File

@ -1,5 +1,7 @@
/**
* Author......: Jens Steube <jens.steube@gmail.com>
* Authors.....: Jens Steube <jens.steube@gmail.com>
* Gabriele Gristina <matrix@hashcat.net>
*
* License.....: MIT
*/
@ -19,6 +21,8 @@
#include "rp_cpu.h"
#include "data.h"
#ifdef HAVE_HWMON
extern hc_global_data_t data;
int get_adapters_num_adl (void *adl, int *iNumberAdapters)
@ -858,3 +862,5 @@ int hm_set_fanspeed_with_device_id_xnvctrl (const uint device_id, const int fans
return -1;
}
#endif // HAVE_HWMON

10
src/interface.c
View File

@ -1,8 +1,14 @@
/**
* Authors.....: Jens Steube <jens.steube@gmail.com>
* Gabriele Gristina <matrix@hashcat.net>
*
* License.....: MIT
*/
#ifdef __APPLE__
#include <stdio.h>
#endif
#include "common.h"
#include "types_int.h"
#include "types.h"
@ -49,7 +55,7 @@ static const char PA_013[] = "Invalid psafe2 filesize";
static const char PA_014[] = "Invalid psafe3 filesize";
static const char PA_015[] = "Invalid truecrypt filesize";
static const char PA_016[] = "Invalid veracrypt filesize";
static const char PA_017[] = "Invalid SIP directive, only MD5 is supported";
//static const char PA_017[] = "Invalid SIP directive, only MD5 is supported";
static const char PA_255[] = "Unknown error";
static const char HT_00000[] = "MD5";
@ -328,7 +334,7 @@ static const char SIGNATURE_SIP_AUTH[] = "$sip$*";
static const char SIGNATURE_SSHA1B64_lower[] = "{ssha}";
static const char SIGNATURE_SSHA1B64_upper[] = "{SSHA}";
static const char SIGNATURE_SYBASEASE[] = "0xc007";
static const char SIGNATURE_TRUECRYPT[] = "TRUE";
//static const char SIGNATURE_TRUECRYPT[] = "TRUE";
static const char SIGNATURE_ZIP2_START[] = "$zip2$";
static const char SIGNATURE_ZIP2_STOP[] = "$/zip2$";

8
src/logfile.c
View File

@ -1,8 +1,14 @@
/**
* Author......: Jens Steube <jens.steube@gmail.com>
* Authors.....: Jens Steube <jens.steube@gmail.com>
* Gabriele Gristina <matrix@hashcat.net>
*
* License.....: MIT
*/
#ifdef __APPLE__
#include <stdio.h>
#endif
#include "common.h"
#include "types_int.h"
#include "types.h"

8
src/logging.c
View File

@ -1,8 +1,14 @@
/**
* Author......: Jens Steube <jens.steube@gmail.com>
* Authors.....: Jens Steube <jens.steube@gmail.com>
* Gabriele Gristina <matrix@hashcat.net>
*
* License.....: MIT
*/
#ifdef __APPLE__
#include <stdio.h>
#endif
#include "common.h"
#include "logging.h"

8
src/mpsp.c
View File

@ -1,8 +1,14 @@
/**
* Author......: Jens Steube <jens.steube@gmail.com>
* Authors.....: Jens Steube <jens.steube@gmail.com>
* Gabriele Gristina <matrix@hashcat.net>
*
* License.....: MIT
*/
#ifdef __APPLE__
#include <stdio.h>
#endif
#include "common.h"
#include "types_int.h"
#include "types.h"

4
src/shared.c
View File

@ -6,6 +6,10 @@
* License.....: MIT
*/
#ifdef __APPLE__
#include <stdio.h>
#endif
#include "common.h"
#include "types_int.h"
#include "types.h"