diff --git a/include/interface.h b/include/interface.h index 39c7f913c..c14cb7bb0 100644 --- a/include/interface.h +++ b/include/interface.h @@ -1718,16 +1718,24 @@ u32 hashconfig_forced_kernel_threads (hashcat_ctx_t *hashcat_ctx); u32 hashconfig_get_kernel_threads (hashcat_ctx_t *hashcat_ctx, const hc_device_param_t *device_param); u32 hashconfig_get_kernel_loops (hashcat_ctx_t *hashcat_ctx); int hashconfig_general_defaults (hashcat_ctx_t *hashcat_ctx); -int hashconfig_pw_min (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, const bool optimized_kernel); -int hashconfig_pw_max (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, const bool optimized_kernel); -int hashconfig_salt_min (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, const bool optimized_kernel); -int hashconfig_salt_max (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, const bool optimized_kernel); +int hashconfig_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); +int hashconfig_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 hashconfig_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); +int hashconfig_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); void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, void *esalt, void *hook_salt); -const char *hashconfig_benchmark_mask (hashcat_ctx_t *hashcat_ctx); +const char *hashconfig_benchmark_mask (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 hashconfig_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); +u64 hashconfig_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); +u32 hashconfig_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); +u64 hashconfig_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 hashconfig_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); +u32 hashconfig_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 hashconfig_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 hashconfig_benchmark_salt_len (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra); void decoder_apply_optimizer (const hashconfig_t *hashconfig, void *data); +void decoder_apply_options (const hashconfig_t *hashconfig, void *data); void encoder_apply_optimizer (const hashconfig_t *hashconfig, void *data); -void decoder_apply_options (const hashconfig_t *hashconfig, void *data); -void encoder_apply_options (const hashconfig_t *hashconfig, void *data); +void encoder_apply_options (const hashconfig_t *hashconfig, void *data); #endif // _INTERFACE_H diff --git a/include/modules.h b/include/modules.h index 51a3f1db1..e1f4f0a97 100644 --- a/include/modules.h +++ b/include/modules.h @@ -2,33 +2,34 @@ #ifndef _MODULES_H #define _MODULES_H -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); +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); +const char *module_benchmark_mask (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_benchmark_salt_len (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, MAYBE_UNUSED 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, MAYBE_UNUSED const int line_size); +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, MAYBE_UNUSED 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, MAYBE_UNUSED 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 1f896c595..da18ae94c 100644 --- a/include/types.h +++ b/include/types.h @@ -929,6 +929,9 @@ struct hashconfig const char *st_pass; const char *hash_name; + + const char *benchmark_mask; + u32 benchmark_salt_len; }; typedef struct hashconfig hashconfig_t; @@ -2200,31 +2203,33 @@ typedef struct event_ctx typedef struct module_ctx { - 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 *); + u32 (*module_attack_exec) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + const char *(*module_benchmark_mask) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *); + u32 (*module_benchmark_salt_len) (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); + 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 46df7f100..7639c06c8 100644 --- a/modules/m01000.c +++ b/modules/m01000.c @@ -17,11 +17,8 @@ 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 @@ -35,10 +32,38 @@ 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; + +void module_register (module_ctx_t *module_ctx) +{ + module_ctx->module_attack_exec = module_attack_exec; + module_ctx->module_benchmark_mask = module_benchmark_mask; + module_ctx->module_benchmark_salt_len = module_benchmark_salt_len; + 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; +} 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; } @@ -46,45 +71,79 @@ u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig, 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_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 hashconfig_opti_type (hashconfig, user_options, 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 hashconfig_opts_type (hashconfig, user_options, 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 hashconfig_salt_type (hashconfig, user_options, 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) +{ + return hashconfig_esalt_size (hashconfig, user_options, 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) +{ + return hashconfig_tmp_size (hashconfig, user_options, 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) +{ + return hashconfig_hook_salt_size (hashconfig, user_options, 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) +{ + return hashconfig_hook_size (hashconfig, user_options, user_options_extra); +} + +const char *module_benchmark_mask (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 hashconfig_benchmark_mask (hashconfig, user_options, user_options_extra); +} + +u32 module_benchmark_salt_len (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 hashconfig_benchmark_salt_len (hashconfig, user_options, 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) { - const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); - - return hashconfig_salt_min (hashconfig, user_options, user_options_extra, optimized_kernel); + return hashconfig_salt_min (hashconfig, user_options, 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) { - const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); - - return hashconfig_salt_max (hashconfig, user_options, user_options_extra, optimized_kernel); + return hashconfig_salt_max (hashconfig, user_options, 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) { - const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); - - return hashconfig_pw_min (hashconfig, user_options, user_options_extra, optimized_kernel); + return hashconfig_pw_min (hashconfig, user_options, 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) { - const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); - - return hashconfig_pw_max (hashconfig, user_options, user_options_extra, optimized_kernel); + return hashconfig_pw_max (hashconfig, user_options, 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, MAYBE_UNUSED const int line_len) @@ -143,31 +202,3 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE return 32; } - -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_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/interface.c b/src/interface.c index 4b6ba0111..1c0e581e6 100644 --- a/src/interface.c +++ b/src/interface.c @@ -23624,28 +23624,30 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) 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); + hashconfig->attack_exec = module_ctx->module_attack_exec (hashconfig, user_options, user_options_extra); + hashconfig->benchmark_mask = module_ctx->module_benchmark_mask (hashconfig, user_options, user_options_extra); + hashconfig->benchmark_salt_len = module_ctx->module_benchmark_salt_len (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) @@ -29256,11 +29258,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) }; */ - // temp - - if (hashconfig->tmp_size == 0) hashconfig->tmp_size = 4; - if (hashconfig->hook_size == 0) hashconfig->hook_size = 4; - return 0; } @@ -29418,8 +29415,10 @@ u32 hashconfig_get_kernel_loops (hashcat_ctx_t *hashcat_ctx) return kernel_loops_fixed; } -int hashconfig_pw_min (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, const bool optimized_kernel) +int hashconfig_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) { + const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); + // pw_min : algo specific hard min length u32 pw_min = PW_MIN; @@ -29447,8 +29446,10 @@ int hashconfig_pw_min (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_o return pw_min; } -int hashconfig_pw_max (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, const bool optimized_kernel) +int hashconfig_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) { + const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); + // pw_max : some algo suffer from support for long passwords, // the user need to add -L to enable support for them @@ -29691,8 +29692,10 @@ int hashconfig_pw_max (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_o return pw_max; } -int hashconfig_salt_min (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, const bool optimized_kernel) +int hashconfig_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) { + const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); + // salt_min : this limit is only interessting for generic hash types that support a salt u32 salt_min = SALT_MIN; @@ -29720,8 +29723,10 @@ int hashconfig_salt_min (const hashconfig_t *hashconfig, MAYBE_UNUSED const user return salt_min; } -int hashconfig_salt_max (const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, const bool optimized_kernel) +int hashconfig_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) { + const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL); + // salt_max : this limit is only interessting for generic hash types that support a salt u32 salt_max = SALT_MAX; @@ -29891,7 +29896,7 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo if (hashconfig->is_salted == true) { - salt->salt_len = 8; + salt->salt_len = hashconfig->benchmark_salt_len; // special salt handling @@ -30307,12 +30312,37 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo } } -const char *hashconfig_benchmark_mask (hashcat_ctx_t *hashcat_ctx) +u32 hashconfig_benchmark_salt_len (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { - hashconfig_t *hashconfig = hashcat_ctx->hashconfig; + u32 salt_len = 0; - const char *mask = NULL; + if (hashconfig->is_salted == true) + { + salt_len = 8; + } + return salt_len; +} + +u32 hashconfig_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) +{ + const u32 opti_type = 0; + + return opti_type; +} + +u64 hashconfig_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) +{ + const u64 opts_type = 0; + + return opts_type; +} + +const char *hashconfig_benchmark_mask (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 *mask = "?b?b?b?b?b?b?b"; + + /* switch (hashconfig->hash_mode) { case 2500: mask = "?a?a?a?a?a?a?a?a"; @@ -30340,10 +30370,46 @@ const char *hashconfig_benchmark_mask (hashcat_ctx_t *hashcat_ctx) default: mask = "?b?b?b?b?b?b?b"; break; } + */ return mask; } +u32 hashconfig_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) +{ + const u32 tmp_size = 4; + + return tmp_size; +} + +u64 hashconfig_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 u64 esalt_size = 0; + + return esalt_size; +} + +u32 hashconfig_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 u32 salt_type = SALT_TYPE_NONE; + + return salt_type; +} + +u64 hashconfig_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) +{ + const u64 hook_salt_size = 0; + + return hook_salt_size; +} + +u64 hashconfig_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) +{ + const u64 hook_size = 4; + + return hook_size; +} + void decoder_apply_optimizer (const hashconfig_t *hashconfig, void *data) { const u32 hash_type = hashconfig->hash_type; diff --git a/src/mpsp.c b/src/mpsp.c index e306e6c26..932038d43 100644 --- a/src/mpsp.c +++ b/src/mpsp.c @@ -1390,9 +1390,10 @@ int mask_ctx_update_loop (hashcat_ctx_t *hashcat_ctx) int mask_ctx_init (hashcat_ctx_t *hashcat_ctx) { - mask_ctx_t *mask_ctx = hashcat_ctx->mask_ctx; - user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra; - user_options_t *user_options = hashcat_ctx->user_options; + const hashconfig_t *hashconfig = hashcat_ctx->hashconfig; + mask_ctx_t *mask_ctx = hashcat_ctx->mask_ctx; + const user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra; + const user_options_t *user_options = hashcat_ctx->user_options; mask_ctx->enabled = false; @@ -1526,7 +1527,7 @@ int mask_ctx_init (hashcat_ctx_t *hashcat_ctx) } else { - const char *mask = hashconfig_benchmark_mask (hashcat_ctx); + const char *mask = hashconfig->benchmark_mask; const int rc = mask_append (hashcat_ctx, mask, NULL); diff --git a/src/outfile.c b/src/outfile.c index 117b75e3d..d6a9b386f 100644 --- a/src/outfile.c +++ b/src/outfile.c @@ -357,7 +357,7 @@ int build_plain (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, pl } } - const u32 pw_max = hashconfig_pw_max (hashconfig, user_options, user_options_extra, false); + const u32 pw_max = hashconfig_pw_max (hashconfig, user_options, user_options_extra); if (plain_len > (int) hashconfig->pw_max) plain_len = MIN (plain_len, (int) pw_max);