DeforaNetworks/hashcat
3
0
Fork 0
Code Releases Activity

Prepare new --hook-threads feature

Browse Source
This commit is contained in:
Jens Steube
2019-11-02 10:29:34 +01:00
parent 9a4bb20135
commit d71afd6d7a
7 changed files with 78 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/shared.h
+2
View File
@@ -64,6 +64,8 @@ bool hc_string_is_digit (const char *s);
void hc_string_trim_trailing (char *s);
void hc_string_trim_leading (char *s);
int hc_get_processor_count ();
bool hc_same_files (char *file1, char *file2);
u32 hc_strtoul (const char *nptr, char **endptr, int base);
include/types.h
+41 -38
View File
@@ -583,6 +583,7 @@ typedef enum user_options_defaults
HEX_CHARSET = false,
HEX_SALT = false,
HEX_WORDLIST = false,
HOOK_THREADS = 0,
INCREMENT = false,
INCREMENT_MAX = PW_MAX,
INCREMENT_MIN = 1,
@@ -647,60 +648,61 @@ typedef enum user_options_map
IDX_ATTACK_MODE = 'a',
IDX_BACKEND_DEVICES = 'd',
IDX_BACKEND_INFO = 'I',
IDX_BACKEND_VECTOR_WIDTH = 0xff27,
IDX_BENCHMARK_ALL = 0xff01,
IDX_BACKEND_VECTOR_WIDTH = 0xff01,
IDX_BENCHMARK_ALL = 0xff02,
IDX_BENCHMARK = 'b',
IDX_BITMAP_MAX = 0xff02,
IDX_BITMAP_MIN = 0xff03,
IDX_BITMAP_MAX = 0xff03,
IDX_BITMAP_MIN = 0xff04,
#ifdef WITH_BRAIN
IDX_BRAIN_CLIENT = 'z',
IDX_BRAIN_CLIENT_FEATURES = 0xff04,
IDX_BRAIN_HOST = 0xff05,
IDX_BRAIN_PASSWORD = 0xff06,
IDX_BRAIN_PORT = 0xff07,
IDX_BRAIN_SERVER = 0xff08,
IDX_BRAIN_SESSION = 0xff09,
IDX_BRAIN_SESSION_WHITELIST = 0xff0a,
IDX_BRAIN_CLIENT_FEATURES = 0xff05,
IDX_BRAIN_HOST = 0xff06,
IDX_BRAIN_PASSWORD = 0xff07,
IDX_BRAIN_PORT = 0xff08,
IDX_BRAIN_SERVER = 0xff09,
IDX_BRAIN_SESSION = 0xff0a,
IDX_BRAIN_SESSION_WHITELIST = 0xff0b,
#endif
IDX_CPU_AFFINITY = 0xff0b,
IDX_CPU_AFFINITY = 0xff0c,
IDX_CUSTOM_CHARSET_1 = '1',
IDX_CUSTOM_CHARSET_2 = '2',
IDX_CUSTOM_CHARSET_3 = '3',
IDX_CUSTOM_CHARSET_4 = '4',
IDX_DEBUG_FILE = 0xff0c,
IDX_DEBUG_MODE = 0xff0d,
IDX_ENCODING_FROM = 0xff0e,
IDX_ENCODING_TO = 0xff0f,
IDX_EXAMPLE_HASHES = 0xff10,
IDX_FORCE = 0xff11,
IDX_HWMON_DISABLE = 0xff12,
IDX_HWMON_TEMP_ABORT = 0xff13,
IDX_DEBUG_FILE = 0xff0d,
IDX_DEBUG_MODE = 0xff0e,
IDX_ENCODING_FROM = 0xff0f,
IDX_ENCODING_TO = 0xff10,
IDX_EXAMPLE_HASHES = 0xff11,
IDX_FORCE = 0xff12,
IDX_HWMON_DISABLE = 0xff13,
IDX_HWMON_TEMP_ABORT = 0xff14,
IDX_HASH_MODE = 'm',
IDX_HCCAPX_MESSAGE_PAIR = 0xff14,
IDX_HCCAPX_MESSAGE_PAIR = 0xff15,
IDX_HELP = 'h',
IDX_HEX_CHARSET = 0xff15,
IDX_HEX_SALT = 0xff16,
IDX_HEX_WORDLIST = 0xff17,
IDX_HEX_CHARSET = 0xff16,
IDX_HEX_SALT = 0xff17,
IDX_HEX_WORDLIST = 0xff18,
IDX_HOOK_THREADS = 0xff19,
IDX_INCREMENT = 'i',
IDX_INCREMENT_MAX = 0xff18,
IDX_INCREMENT_MIN = 0xff19,
IDX_INDUCTION_DIR = 0xff1a,
IDX_KEEP_GUESSING = 0xff1b,
IDX_INCREMENT_MAX = 0xff1a,
IDX_INCREMENT_MIN = 0xff1b,
IDX_INDUCTION_DIR = 0xff1c,
IDX_KEEP_GUESSING = 0xff1d,
IDX_KERNEL_ACCEL = 'n',
IDX_KERNEL_LOOPS = 'u',
IDX_KERNEL_THREADS = 'T',
IDX_KEYBOARD_LAYOUT_MAPPING = 0xff1c,
IDX_KEYSPACE = 0xff1d,
IDX_LEFT = 0xff1e,
IDX_KEYBOARD_LAYOUT_MAPPING = 0xff1e,
IDX_KEYSPACE = 0xff1f,
IDX_LEFT = 0xff20,
IDX_LIMIT = 'l',
IDX_LOGFILE_DISABLE = 0xff1f,
IDX_LOOPBACK = 0xff20,
IDX_MACHINE_READABLE = 0xff21,
IDX_MARKOV_CLASSIC = 0xff22,
IDX_MARKOV_DISABLE = 0xff23,
IDX_MARKOV_HCSTAT2 = 0xff24,
IDX_LOGFILE_DISABLE = 0xff21,
IDX_LOOPBACK = 0xff22,
IDX_MACHINE_READABLE = 0xff23,
IDX_MARKOV_CLASSIC = 0xff24,
IDX_MARKOV_DISABLE = 0xff25,
IDX_MARKOV_HCSTAT2 = 0xff26,
IDX_MARKOV_THRESHOLD = 't',
IDX_NONCE_ERROR_CORRECTIONS = 0xff25,
IDX_NONCE_ERROR_CORRECTIONS = 0xff27,
IDX_OPENCL_DEVICE_TYPES = 'D',
IDX_OPTIMIZED_KERNEL_ENABLE = 'O',
IDX_OUTFILE_AUTOHEX_DISABLE = 0xff28,
@@ -1916,6 +1918,7 @@ typedef struct user_options
u32 hwmon_temp_abort;
int hash_mode;
u32 hccapx_message_pair;
u32 hook_threads;
u32 increment_max;
u32 increment_min;
u32 kernel_accel;