From bd37903131526a49421f01749ae10345a5454c9b Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Fri, 14 Dec 2018 17:18:17 +0100 Subject: [PATCH] Add hook_size, tmp_size, hook_salt_size --- include/modules.h | 47 ++++++++++------- include/types.h | 46 ++++++++++------- modules/m01000.c | 127 ++++++++++++++++++++++++++-------------------- src/Makefile | 4 ++ src/interface.c | 91 +++++++++++++++++++++------------ 5 files changed, 188 insertions(+), 127 deletions(-) diff --git a/include/modules.h b/include/modules.h index c481b7cf9..9701e432c 100644 --- a/include/modules.h +++ b/include/modules.h @@ -2,24 +2,33 @@ #ifndef _MODULES_H #define _MODULES_H -const char *module_hash_name (); -u32 module_salt_type (); -u32 module_attack_exec (); -u64 module_opts_type (); -u32 module_dgst_size (); -u32 module_opti_type (); -u32 module_dgst_pos0 (); -u32 module_dgst_pos1 (); -u32 module_dgst_pos2 (); -u32 module_dgst_pos3 (); -const char *module_st_hash (); -const char *module_st_pass (); -u32 module_pw_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); -u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); -u32 module_salt_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); -u32 module_salt_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); -int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, const char *line_buf, const int line_len); -int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, char *line_buf, const int line_size); -void module_register (module_ctx_t *module_ctx); +u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +const char *module_hash_name (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u64 module_hook_salt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u64 module_hook_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u64 module_kern_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u64 module_opts_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_salt_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +const char *module_st_hash (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_salt_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_salt_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_pw_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); +u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); + +int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, const char *line_buf, const int line_len); +int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, char *line_buf, const int line_size); + +void module_register (module_ctx_t *module_ctx); + #endif // _MODULES_H diff --git a/include/types.h b/include/types.h index 4f137e6fb..c181a2a46 100644 --- a/include/types.h +++ b/include/types.h @@ -925,6 +925,8 @@ struct hashconfig const char *st_hash; const char *st_pass; + + const char *hash_name; }; typedef struct hashconfig hashconfig_t; @@ -2196,25 +2198,31 @@ typedef struct event_ctx typedef struct module_ctx { - u32 (*module_attack_exec) (); - u32 (*module_dgst_pos0) (); - u32 (*module_dgst_pos1) (); - u32 (*module_dgst_pos2) (); - u32 (*module_dgst_pos3) (); - u32 (*module_dgst_size) (); - u64 (*module_esalt_size) (); - int (*module_hash_decode) (const hashconfig_t *, void *, salt_t *, void *, const char *, const int); - int (*module_hash_encode) (const hashconfig_t *, const void *, const salt_t *, const void *, char *, int); - const char *(*module_hash_name) (); - u32 (*module_opti_type) (); - u64 (*module_opts_type) (); - u32 (*module_pw_min) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); - u32 (*module_pw_max) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); - u32 (*module_salt_min) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); - u32 (*module_salt_max) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); - u32 (*module_salt_type) (); - const char *(*module_st_hash) (); - const char *(*module_st_pass) (); + u32 (*module_attack_exec) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_dgst_pos0) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_dgst_pos1) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_dgst_pos2) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_dgst_pos3) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_dgst_size) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u64 (*module_esalt_size) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + const char *(*module_hash_name) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_hash_type) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u64 (*module_hook_salt_size) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u64 (*module_hook_size) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u64 (*module_kern_type) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_opti_type) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u64 (*module_opts_type) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_pw_min) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_pw_max) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_salt_min) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_salt_max) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_salt_type) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + const char *(*module_st_hash) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + const char *(*module_st_pass) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u64 (*module_tmp_size) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + + int (*module_hash_decode) (const hashconfig_t *, void *, salt_t *, void *, const char *, const int); + int (*module_hash_encode) (const hashconfig_t *, const void *, const salt_t *, const void *, char *, int); } module_ctx_t; diff --git a/modules/m01000.c b/modules/m01000.c index c4eeb1ad0..adc10e96c 100644 --- a/modules/m01000.c +++ b/modules/m01000.c @@ -11,43 +11,53 @@ #include "inc_hash_constants.h" #include "modules.h" -static const char *HASH_NAME = "NTLM"; -static const u32 SALT_TYPE = SALT_TYPE_NONE; -static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL; -static const u32 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE - | OPTS_TYPE_PT_ADD80 - | OPTS_TYPE_PT_ADDBITS14 - | OPTS_TYPE_PT_UTF16LE; -static const u32 DGST_SIZE = DGST_SIZE_4_4; -static const u64 ESALT_SIZE = 0; -static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE - | OPTI_TYPE_PRECOMPUTE_INIT - | OPTI_TYPE_PRECOMPUTE_MERKLE - | OPTI_TYPE_MEET_IN_MIDDLE - | OPTI_TYPE_EARLY_SKIP - | OPTI_TYPE_NOT_ITERATED - | OPTI_TYPE_NOT_SALTED - | OPTI_TYPE_RAW_HASH; -static const u32 DGST_POS0 = 0; -static const u32 DGST_POS1 = 3; -static const u32 DGST_POS2 = 2; -static const u32 DGST_POS3 = 1; -static const char *ST_HASH = "b4b9b02e6f09a9bd760f388b67351e2b"; -static const char *ST_PASS = "hashcat"; - -u32 module_attack_exec () { return ATTACK_EXEC; } -u32 module_dgst_pos0 () { return DGST_POS0; } -u32 module_dgst_pos1 () { return DGST_POS1; } -u32 module_dgst_pos2 () { return DGST_POS2; } -u32 module_dgst_pos3 () { return DGST_POS3; } -u32 module_dgst_size () { return DGST_SIZE; } -u64 module_esalt_size () { return ESALT_SIZE; } -const char *module_hash_name () { return HASH_NAME; } -u32 module_opti_type () { return OPTI_TYPE; } -u64 module_opts_type () { return OPTS_TYPE; } -u32 module_salt_type () { return SALT_TYPE; } -const char *module_st_hash () { return ST_HASH; } -const char *module_st_pass () { return ST_PASS; } +static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL; +static const u32 DGST_POS0 = 0; +static const u32 DGST_POS1 = 3; +static const u32 DGST_POS2 = 2; +static const u32 DGST_POS3 = 1; +static const u32 DGST_SIZE = DGST_SIZE_4_4; +static const u64 ESALT_SIZE = 0; +static const char *HASH_NAME = "NTLM"; +static const u32 HASH_TYPE = HASH_TYPE_MD4; +static const u64 HOOK_SALT_SIZE = 0; +static const u64 HOOK_SIZE = 0; +static const u32 KERN_TYPE = 1000; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_PRECOMPUTE_INIT + | OPTI_TYPE_PRECOMPUTE_MERKLE + | OPTI_TYPE_MEET_IN_MIDDLE + | OPTI_TYPE_EARLY_SKIP + | OPTI_TYPE_NOT_ITERATED + | OPTI_TYPE_NOT_SALTED + | OPTI_TYPE_RAW_HASH; +static const u32 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE + | OPTS_TYPE_PT_ADD80 + | OPTS_TYPE_PT_ADDBITS14 + | OPTS_TYPE_PT_UTF16LE; +static const u32 SALT_TYPE = SALT_TYPE_NONE; +static const char *ST_HASH = "b4b9b02e6f09a9bd760f388b67351e2b"; +static const char *ST_PASS = "hashcat"; +static const u64 TMP_SIZE = 0; + +u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ATTACK_EXEC; } +u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS0; } +u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS1; } +u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS2; } +u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS3; } +u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_SIZE; } +u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ESALT_SIZE; } +const char *module_hash_name (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_NAME; } +u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_TYPE; } +u64 module_hook_salt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HOOK_SALT_SIZE; } +u64 module_hook_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HOOK_SIZE; } +u64 module_kern_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return KERN_TYPE; } +u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTI_TYPE; } +u64 module_opts_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTS_TYPE; } +u32 module_salt_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return SALT_TYPE; } +const char *module_st_hash (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_HASH; } +const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS; } +u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return TMP_SIZE; } u32 module_salt_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { @@ -150,23 +160,28 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE void module_register (module_ctx_t *module_ctx) { - module_ctx->module_attack_exec = module_attack_exec; - module_ctx->module_dgst_pos0 = module_dgst_pos0; - module_ctx->module_dgst_pos1 = module_dgst_pos1; - module_ctx->module_dgst_pos2 = module_dgst_pos2; - module_ctx->module_dgst_pos3 = module_dgst_pos3; - module_ctx->module_dgst_size = module_dgst_size; - module_ctx->module_esalt_size = module_esalt_size; - module_ctx->module_hash_decode = module_hash_decode; - module_ctx->module_hash_encode = module_hash_encode; - module_ctx->module_hash_name = module_hash_name; - module_ctx->module_opti_type = module_opti_type; - module_ctx->module_opts_type = module_opts_type; - module_ctx->module_pw_max = module_pw_max; - module_ctx->module_pw_min = module_pw_min; - module_ctx->module_salt_max = module_salt_max; - module_ctx->module_salt_min = module_salt_min; - module_ctx->module_salt_type = module_salt_type; - module_ctx->module_st_hash = module_st_hash; - module_ctx->module_st_pass = module_st_pass; + module_ctx->module_attack_exec = module_attack_exec; + module_ctx->module_dgst_pos0 = module_dgst_pos0; + module_ctx->module_dgst_pos1 = module_dgst_pos1; + module_ctx->module_dgst_pos2 = module_dgst_pos2; + module_ctx->module_dgst_pos3 = module_dgst_pos3; + module_ctx->module_dgst_size = module_dgst_size; + module_ctx->module_esalt_size = module_esalt_size; + module_ctx->module_hash_decode = module_hash_decode; + module_ctx->module_hash_encode = module_hash_encode; + module_ctx->module_hash_name = module_hash_name; + module_ctx->module_hash_type = module_hash_type; + module_ctx->module_hook_salt_size = module_hook_salt_size; + module_ctx->module_hook_size = module_hook_size; + module_ctx->module_kern_type = module_kern_type; + module_ctx->module_opti_type = module_opti_type; + module_ctx->module_opts_type = module_opts_type; + module_ctx->module_pw_max = module_pw_max; + module_ctx->module_pw_min = module_pw_min; + module_ctx->module_salt_max = module_salt_max; + module_ctx->module_salt_min = module_salt_min; + module_ctx->module_salt_type = module_salt_type; + module_ctx->module_st_hash = module_st_hash; + module_ctx->module_st_pass = module_st_pass; + module_ctx->module_tmp_size = module_tmp_size; } diff --git a/src/Makefile b/src/Makefile index 87b37a2df..27e499762 100644 --- a/src/Makefile +++ b/src/Makefile @@ -174,6 +174,10 @@ CFLAGS += -Wall CFLAGS += -Wextra endif +## is very annoying during refactor +CFLAGS += -Wno-unused-variable +CFLAGS += -Wno-unused-function + ifeq ($(DEBUG),0) CFLAGS += -O2 ifneq ($(UNAME),Darwin) diff --git a/src/interface.c b/src/interface.c index eb3f8dc4b..fe95cf389 100644 --- a/src/interface.c +++ b/src/interface.c @@ -23598,30 +23598,56 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) const user_options_t *user_options = hashcat_ctx->user_options; const user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra; + //hashconfig->attack_exec = 0; + //hashconfig->dgst_pos0 = 0; + //hashconfig->dgst_pos1 = 0; + //hashconfig->dgst_pos2 = 0; + //hashconfig->dgst_pos3 = 0; + //hashconfig->dgst_size = 0; + //hashconfig->esalt_size = 0; hashconfig->hash_mode = user_options->hash_mode; - hashconfig->hash_type = 0; - hashconfig->salt_type = 0; - hashconfig->attack_exec = 0; - hashconfig->opts_type = 0; - hashconfig->kern_type = 0; - hashconfig->dgst_size = 0; - hashconfig->esalt_size = 0; - hashconfig->hook_salt_size = 0; - hashconfig->tmp_size = 0; - hashconfig->hook_size = 0; - hashconfig->opti_type = 0; - hashconfig->is_salted = false; - hashconfig->has_pure_kernel = false; + //hashconfig->hash_type = 0; hashconfig->has_optimized_kernel = false; - hashconfig->dgst_pos0 = 0; - hashconfig->dgst_pos1 = 0; - hashconfig->dgst_pos2 = 0; - hashconfig->dgst_pos3 = 0; - hashconfig->parse_func = NULL; + hashconfig->has_pure_kernel = false; + //hashconfig->hook_salt_size = 0; + //hashconfig->hook_size = 0; + hashconfig->is_salted = false; + //hashconfig->kern_type = 0; + //hashconfig->opti_type = 0; + //hashconfig->opts_type = 0; + //hashconfig->parse_func = NULL; + //hashconfig->salt_type = 0; hashconfig->separator = user_options->separator; - hashconfig->st_hash = NULL; - hashconfig->st_pass = NULL; + //hashconfig->st_hash = NULL; + //hashconfig->st_pass = NULL; + //hashconfig->tmp_size = 0; + + module_register (module_ctx); + hashconfig->attack_exec = module_ctx->module_attack_exec (hashconfig, user_options, user_options_extra); + hashconfig->dgst_pos0 = module_ctx->module_dgst_pos0 (hashconfig, user_options, user_options_extra); + hashconfig->dgst_pos1 = module_ctx->module_dgst_pos1 (hashconfig, user_options, user_options_extra); + hashconfig->dgst_pos2 = module_ctx->module_dgst_pos2 (hashconfig, user_options, user_options_extra); + hashconfig->dgst_pos3 = module_ctx->module_dgst_pos3 (hashconfig, user_options, user_options_extra); + hashconfig->dgst_size = module_ctx->module_dgst_size (hashconfig, user_options, user_options_extra); + hashconfig->esalt_size = module_ctx->module_esalt_size (hashconfig, user_options, user_options_extra); + hashconfig->hash_name = module_ctx->module_hash_name (hashconfig, user_options, user_options_extra); + hashconfig->hash_type = module_ctx->module_hash_type (hashconfig, user_options, user_options_extra); + hashconfig->hook_salt_size = module_ctx->module_hook_salt_size (hashconfig, user_options, user_options_extra); + hashconfig->hook_size = module_ctx->module_hook_size (hashconfig, user_options, user_options_extra); + hashconfig->kern_type = module_ctx->module_kern_type (hashconfig, user_options, user_options_extra); + hashconfig->opti_type = module_ctx->module_opti_type (hashconfig, user_options, user_options_extra); + hashconfig->opts_type = module_ctx->module_opts_type (hashconfig, user_options, user_options_extra); + hashconfig->pw_max = module_ctx->module_pw_max (hashconfig, user_options, user_options_extra); + hashconfig->pw_min = module_ctx->module_pw_min (hashconfig, user_options, user_options_extra); + hashconfig->salt_max = module_ctx->module_salt_max (hashconfig, user_options, user_options_extra); + hashconfig->salt_min = module_ctx->module_salt_min (hashconfig, user_options, user_options_extra); + hashconfig->salt_type = module_ctx->module_salt_type (hashconfig, user_options, user_options_extra); + hashconfig->st_hash = module_ctx->module_st_hash (hashconfig, user_options, user_options_extra); + hashconfig->st_pass = module_ctx->module_st_pass (hashconfig, user_options, user_options_extra); + hashconfig->tmp_size = module_ctx->module_tmp_size (hashconfig, user_options, user_options_extra); + + /* switch (hashconfig->hash_mode) { case 0: hashconfig->hash_type = HASH_TYPE_MD5; @@ -28876,6 +28902,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) default: return -1; } + */ if (user_options->keyboard_layout_mapping) { @@ -28987,6 +29014,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) // esalt_size + /* hashconfig->esalt_size = 0; switch (hashconfig->hash_mode) @@ -29092,18 +29120,22 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) case 18400: hashconfig->esalt_size = sizeof (odf12_t); break; case 18600: hashconfig->esalt_size = sizeof (odf11_t); break; } + */ // hook_salt_size + /* hashconfig->hook_salt_size = 0; switch (hashconfig->hash_mode) { case 11600: hashconfig->hook_salt_size = sizeof (seven_zip_hook_salt_t); break; } + */ // tmp_size + /* hashconfig->tmp_size = 4; switch (hashconfig->hash_mode) @@ -29211,30 +29243,23 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) case 18400: hashconfig->tmp_size = sizeof (odf12_tmp_t); break; case 18600: hashconfig->tmp_size = sizeof (odf11_tmp_t); break; }; + */ // hook_size + /* hashconfig->hook_size = 4; switch (hashconfig->hash_mode) { case 11600: hashconfig->hook_size = sizeof (seven_zip_hook_t); break; }; + */ - /** - * salt_min, salt_max, pw_min and pw_max - * we have an extra argument optimized_kernel which comes in handy if we want to know about the algorithms - * real pw_max, for example, regardless if the user chooses an optimized kernel or not - */ - - const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); - - hashconfig->pw_min = hashconfig_pw_min (hashconfig, user_options, user_options_extra, optimized_kernel); - hashconfig->pw_max = hashconfig_pw_max (hashconfig, user_options, user_options_extra, optimized_kernel); - hashconfig->salt_min = hashconfig_salt_min (hashconfig, user_options, user_options_extra, optimized_kernel); - hashconfig->salt_max = hashconfig_salt_max (hashconfig, user_options, user_options_extra, optimized_kernel); + // temp - module_register (module_ctx); + if (hashconfig->tmp_size == 0) hashconfig->tmp_size = 4; + if (hashconfig->hook_size == 0) hashconfig->hook_size = 4; return 0; }