From bc22bfee2e5f9faed7912fa06b94f86bfa40e7eb Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Sat, 12 Jan 2019 15:05:33 +0100
Subject: [PATCH] Some cleanup
---
include/interface.h | 18 -
include/modules.h | 2 +
include/shared.h | 2 +
include/types.h | 4 +-
modules/module_00000.c | 12 +-
modules/module_00010.c | 8 +-
modules/module_00011.c | 8 +-
modules/module_00100.c | 13 +-
modules/module_00101.c | 13 +-
modules/module_00110.c | 9 +-
modules/module_00200.c | 12 +-
modules/module_00300.c | 13 +-
modules/module_00900.c | 12 +-
modules/module_01000.c | 12 +-
modules/module_01300.c | 13 +-
modules/module_01400.c | 13 +-
modules/module_01700.c | 13 +-
modules/module_02400.c | 12 +-
modules/module_10800.c | 13 +-
src/Makefile | 2 +-
src/interface.c | 811 ++++++++++++++--------------------------
src/interface_migrate.c | 5 +
src/shared.c | 104 ++++++
src/usage.c | 6 +-
24 files changed, 536 insertions(+), 594 deletions(-)
diff --git a/include/interface.h b/include/interface.h
index 4c1ee4f30..f2b75ab27 100644
--- a/include/interface.h
+++ b/include/interface.h
@@ -32,9 +32,6 @@ typedef enum kernel_workload
* output functions
*/
-const char *strhashcategory (const u32 hash_category);
-const char *stroptitype (const u32 opti_type);
-
int ascii_digest (const hashconfig_t *hashconfig, const hashes_t *hashes, const module_ctx_t *module_ctx, char *out_buf, const int out_size, const u32 salt_pos, const u32 digest_pos);
bool initialize_keyboard_layout_mapping (hashcat_ctx_t *hashcat_ctx, const char *filename, keyboard_layout_mapping_t *keyboard_layout_mapping, int *keyboard_layout_mapping_cnt);
@@ -44,20 +41,11 @@ int execute_keyboard_layout_mapping (u32 plain_buf[64], const int plain_len, ke
int hashconfig_init (hashcat_ctx_t *hashcat_ctx);
void hashconfig_destroy (hashcat_ctx_t *hashcat_ctx);
-u32 default_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 *default_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);
bool default_dictstat_disable (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 default_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 default_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 default_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 default_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 default_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 default_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 default_forced_outfile_format (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 default_hash_category (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 *default_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 default_hash_mode (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 default_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);
bool default_hlfmt_disable (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 default_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 default_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);
@@ -67,9 +55,6 @@ u32 default_kernel_loops_min (MAYBE_UNUSED const hashconfig_t *ha
u32 default_kernel_loops_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 default_kernel_threads_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 default_kernel_threads_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);
-u64 default_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 default_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 default_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);
bool default_outfile_check_disable (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
bool default_outfile_check_nocomp (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
bool default_potfile_disable (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
@@ -79,10 +64,7 @@ u32 default_pw_min (MAYBE_UNUSED const hashconfig_t *ha
u32 default_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 default_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 default_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 default_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);
char default_separator (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 *default_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 *default_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 default_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);
bool default_unstable_warning (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
bool default_warmup_disable (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
diff --git a/include/modules.h b/include/modules.h
index efd2516ba..fed7a3d0b 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -2,6 +2,8 @@
#ifndef _MODULES_H
#define _MODULES_H
+static const size_t MODULE_CONTEXT_SIZE_CURRENT = sizeof (module_ctx_t);
+
void module_init (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);
diff --git a/include/shared.h b/include/shared.h
index b89adbc9a..8a314424d 100644
--- a/include/shared.h
+++ b/include/shared.h
@@ -86,6 +86,8 @@ int select_write_timeout (int sockfd, const int sec);
int select_read_timeout_console (const int sec);
const char *strparser (const u32 parser_status);
+const char *strhashcategory (const u32 hash_category);
+const char *stroptitype (const u32 opti_type);
bool parse_and_store_generic_salt (u8 *out_buf, int *out_len, const u8 *in_buf, const int in_len, MAYBE_UNUSED const hashconfig_t *hashconfig);
diff --git a/include/types.h b/include/types.h
index c2459bcf2..969084871 100644
--- a/include/types.h
+++ b/include/types.h
@@ -2237,11 +2237,13 @@ typedef struct event_ctx
} event_ctx_t;
-#define MODULE_DEFAULT NULL
+#define MODULE_DEFAULT (void *) -1
typedef struct module_ctx
{
void *module_handle;
+
+ size_t module_context_size;
int module_interface_version;
void (*module_init) (struct module_ctx *);
diff --git a/modules/module_00000.c b/modules/module_00000.c
index 98bcf626a..ca261dc6d 100644
--- a/modules/module_00000.c
+++ b/modules/module_00000.c
@@ -32,6 +32,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_LE
| OPTS_TYPE_PT_GENERATE_LE
| OPTS_TYPE_PT_ADD80
| OPTS_TYPE_PT_ADDBITS14;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "8743b52063cd84097a65d1633f5c74f5";
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; }
@@ -46,7 +48,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -111,6 +115,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -146,7 +153,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -166,10 +172,10 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_00010.c b/modules/module_00010.c
index 1231a8c03..b7a9188fa 100644
--- a/modules/module_00010.c
+++ b/modules/module_00010.c
@@ -33,6 +33,7 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_LE
| OPTS_TYPE_ST_ADD80
| OPTS_TYPE_ST_ADDBITS14;
static const u32 SALT_TYPE = SALT_TYPE_GENERIC;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "3d83c8e717ff0e7ecfe187f088d69954:343141";
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; }
@@ -49,6 +50,7 @@ u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -141,6 +143,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -176,7 +181,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -199,7 +203,7 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_00011.c b/modules/module_00011.c
index 8f79036bc..024d0a03f 100644
--- a/modules/module_00011.c
+++ b/modules/module_00011.c
@@ -33,6 +33,7 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_LE
| OPTS_TYPE_ST_ADD80
| OPTS_TYPE_ST_ADDBITS14;
static const u32 SALT_TYPE = SALT_TYPE_GENERIC;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "5b91686523680d1e6bab1071ea4080cb:670326450574076786209992882236";
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; }
@@ -49,6 +50,7 @@ u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -141,6 +143,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -176,7 +181,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -199,7 +203,7 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_00100.c b/modules/module_00100.c
index 7568d8501..cefcfa3cf 100644
--- a/modules/module_00100.c
+++ b/modules/module_00100.c
@@ -31,6 +31,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_BE
| OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_ADD80
| OPTS_TYPE_PT_ADDBITS15;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "b89eaac7e61417341b710b727768294d0e6a277b";
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; }
@@ -45,7 +47,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -113,6 +117,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -148,7 +155,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -163,14 +169,15 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
module_ctx->module_potfile_disable = MODULE_DEFAULT;
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
+ module_ctx->module_pwdump_column = MODULE_DEFAULT;
module_ctx->module_pw_max = MODULE_DEFAULT;
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_00101.c b/modules/module_00101.c
index 5810383d8..212cf71b4 100644
--- a/modules/module_00101.c
+++ b/modules/module_00101.c
@@ -31,6 +31,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_BE
| OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_ADD80
| OPTS_TYPE_PT_ADDBITS15;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "{SHA}uJ6qx+YUFzQbcQtyd2gpTQ5qJ3s=";
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; }
@@ -45,7 +47,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -119,6 +123,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -154,7 +161,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -169,14 +175,15 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
module_ctx->module_potfile_disable = MODULE_DEFAULT;
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
+ module_ctx->module_pwdump_column = MODULE_DEFAULT;
module_ctx->module_pw_max = MODULE_DEFAULT;
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_00110.c b/modules/module_00110.c
index 04a2e38db..f2b580746 100644
--- a/modules/module_00110.c
+++ b/modules/module_00110.c
@@ -32,6 +32,7 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_BE
| OPTS_TYPE_ST_ADD80
| OPTS_TYPE_ST_ADDBITS15;
static const u32 SALT_TYPE = SALT_TYPE_GENERIC;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "848952984db93bdd2d0151d4ecca6ea44fcf49e3:30007548152";
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; }
@@ -48,6 +49,7 @@ u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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,6 +145,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -178,7 +183,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -193,6 +197,7 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
module_ctx->module_potfile_disable = MODULE_DEFAULT;
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
+ module_ctx->module_pwdump_column = MODULE_DEFAULT;
module_ctx->module_pw_max = MODULE_DEFAULT;
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
@@ -200,7 +205,7 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_00200.c b/modules/module_00200.c
index 6c7983e0c..e19cdfea1 100644
--- a/modules/module_00200.c
+++ b/modules/module_00200.c
@@ -22,6 +22,8 @@ static const u32 HASH_TYPE = HASH_TYPE_MYSQL;
static const u64 KERN_TYPE = 200;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE;
static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_BE;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "7196759210defdc0";
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; }
@@ -36,7 +38,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -99,6 +103,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -134,7 +141,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -154,10 +160,10 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_00300.c b/modules/module_00300.c
index 1c626d542..aa04b06d6 100644
--- a/modules/module_00300.c
+++ b/modules/module_00300.c
@@ -30,6 +30,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_BE
| OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_ADD80
| OPTS_TYPE_PT_ADDBITS15;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "fcf7c1b8749cf99d88e5f34271d636178fb5d130";
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; }
@@ -44,7 +46,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -112,6 +116,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -147,7 +154,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -162,14 +168,15 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
module_ctx->module_potfile_disable = MODULE_DEFAULT;
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
+ module_ctx->module_pwdump_column = MODULE_DEFAULT;
module_ctx->module_pw_max = MODULE_DEFAULT;
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_00900.c b/modules/module_00900.c
index 4adcfd827..9f15cbb61 100644
--- a/modules/module_00900.c
+++ b/modules/module_00900.c
@@ -32,6 +32,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_LE
| OPTS_TYPE_PT_GENERATE_LE
| OPTS_TYPE_PT_ADD80
| OPTS_TYPE_PT_ADDBITS14;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "afe04867ec7a3845145579a95f72eca7";
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; }
@@ -46,7 +48,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -111,6 +115,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -146,7 +153,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -166,10 +172,10 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_01000.c b/modules/module_01000.c
index 928ee2caa..03c8b4b8c 100644
--- a/modules/module_01000.c
+++ b/modules/module_01000.c
@@ -34,6 +34,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_LE
| OPTS_TYPE_PT_ADDBITS14
| OPTS_TYPE_PT_UTF16LE;
static const u32 PWDUMP_COLUMN = PWDUMP_COLUMN_NTLM_HASH;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "b4b9b02e6f09a9bd760f388b67351e2b";
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; }
@@ -49,7 +51,9 @@ u64 module_kern_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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_pwdump_column (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 PWDUMP_COLUMN; }
+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; }
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)
{
@@ -114,6 +118,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -149,7 +156,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -169,10 +175,10 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_01300.c b/modules/module_01300.c
index fa509ea30..d12692d7a 100644
--- a/modules/module_01300.c
+++ b/modules/module_01300.c
@@ -31,6 +31,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_BE
| OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_ADD80
| OPTS_TYPE_PT_ADDBITS15;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "e4fa1555ad877bf0ec455483371867200eee89550a93eff2f95a6198";
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; }
@@ -45,7 +47,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -119,6 +123,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -154,7 +161,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -169,14 +175,15 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
module_ctx->module_potfile_disable = MODULE_DEFAULT;
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
+ module_ctx->module_pwdump_column = MODULE_DEFAULT;
module_ctx->module_pw_max = MODULE_DEFAULT;
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_01400.c b/modules/module_01400.c
index 5e3eecbfc..54b7a1a95 100644
--- a/modules/module_01400.c
+++ b/modules/module_01400.c
@@ -31,6 +31,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_BE
| OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_ADD80
| OPTS_TYPE_PT_ADDBITS15;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "127e6fbfe24a750e72930c220a8e138275656b8e5d8f48a98c3c92df2caba935";
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; }
@@ -45,7 +47,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -122,6 +126,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -157,7 +164,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -172,14 +178,15 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
module_ctx->module_potfile_disable = MODULE_DEFAULT;
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
+ module_ctx->module_pwdump_column = MODULE_DEFAULT;
module_ctx->module_pw_max = MODULE_DEFAULT;
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_01700.c b/modules/module_01700.c
index 01d1c7ad7..7ebc77e14 100644
--- a/modules/module_01700.c
+++ b/modules/module_01700.c
@@ -32,6 +32,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_BE
| OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_ADD80
| OPTS_TYPE_PT_ADDBITS15;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "82a9dda829eb7f8ffe9fbe49e45d47d2dad9664fbb7adf72492e3c81ebd3e29134d9bc12212bf83c6840f10e8246b9db54a4859b7ccd0123d86e5872c1e5082f";
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; }
@@ -46,7 +48,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -123,6 +127,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -158,7 +165,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -173,14 +179,15 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
module_ctx->module_potfile_disable = MODULE_DEFAULT;
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
+ module_ctx->module_pwdump_column = MODULE_DEFAULT;
module_ctx->module_pw_max = MODULE_DEFAULT;
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_02400.c b/modules/module_02400.c
index 1ce781e1d..63a52d562 100644
--- a/modules/module_02400.c
+++ b/modules/module_02400.c
@@ -28,6 +28,8 @@ static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_NOT_SALTED;
static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_LE
| OPTS_TYPE_PT_GENERATE_LE;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "dRRVnUmUHXOTt9nk";
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; }
@@ -42,7 +44,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -137,6 +141,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -172,7 +179,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -192,10 +198,10 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/modules/module_10800.c b/modules/module_10800.c
index 6647f7d53..b21882ce3 100644
--- a/modules/module_10800.c
+++ b/modules/module_10800.c
@@ -32,6 +32,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STATE_BUFFER_BE
| OPTS_TYPE_PT_GENERATE_BE
| OPTS_TYPE_PT_ADD80
| OPTS_TYPE_PT_ADDBITS15;
+static const u32 SALT_TYPE = SALT_TYPE_NONE;
+static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "07371af1ca1fca7c6941d2399f3610f1e392c56c6d73fddffe38f18c430a2817028dae1ef09ac683b62148a2c8757f42";
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; }
@@ -46,7 +48,9 @@ u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
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; }
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)
{
@@ -121,6 +125,9 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
void module_init (module_ctx_t *module_ctx)
{
+ module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
+ module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
+
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
@@ -156,7 +163,6 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
- module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
@@ -171,14 +177,15 @@ void module_init (module_ctx_t *module_ctx)
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
module_ctx->module_potfile_disable = MODULE_DEFAULT;
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
+ module_ctx->module_pwdump_column = MODULE_DEFAULT;
module_ctx->module_pw_max = MODULE_DEFAULT;
module_ctx->module_pw_min = MODULE_DEFAULT;
module_ctx->module_salt_max = MODULE_DEFAULT;
module_ctx->module_salt_min = MODULE_DEFAULT;
- module_ctx->module_salt_type = MODULE_DEFAULT;
+ module_ctx->module_salt_type = module_salt_type;
module_ctx->module_separator = MODULE_DEFAULT;
module_ctx->module_st_hash = module_st_hash;
- module_ctx->module_st_pass = MODULE_DEFAULT;
+ module_ctx->module_st_pass = module_st_pass;
module_ctx->module_tmp_size = MODULE_DEFAULT;
module_ctx->module_unstable_warning = MODULE_DEFAULT;
module_ctx->module_warmup_disable = MODULE_DEFAULT;
diff --git a/src/Makefile b/src/Makefile
index 7232e57a8..7171af8c3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@
##
SHARED := 0
-DEBUG := 1
+DEBUG := 0
PRODUCTION := 0
PRODUCTION_VERSION := v5.1.0
ENABLE_BRAIN := 1
diff --git a/src/interface.c b/src/interface.c
index 263a273de..0ea7e7b64 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -16,56 +16,6 @@
#include "modules.h"
#include "dynloader.h"
-static const char *ST_PASS_HASHCAT_PLAIN = "hashcat";
-static const char *ST_PASS_HASHCAT_EXCL = "hashcat!";
-static const char *ST_PASS_HASHCAT_EXCL3 = "hashcat!!!";
-static const char *ST_PASS_HASHCAT_ONE = "hashcat1";
-static const char *ST_PASS_HASHCAT_ONET3 = "hashcat1hashcat1hashcat1";
-
-static const char *OPTI_STR_OPTIMIZED_KERNEL = "Optimized-Kernel";
-static const char *OPTI_STR_ZERO_BYTE = "Zero-Byte";
-static const char *OPTI_STR_PRECOMPUTE_INIT = "Precompute-Init";
-static const char *OPTI_STR_PRECOMPUTE_MERKLE = "Precompute-Merkle-Demgard";
-static const char *OPTI_STR_PRECOMPUTE_PERMUT = "Precompute-Final-Permutation";
-static const char *OPTI_STR_MEET_IN_MIDDLE = "Meet-In-The-Middle";
-static const char *OPTI_STR_EARLY_SKIP = "Early-Skip";
-static const char *OPTI_STR_NOT_SALTED = "Not-Salted";
-static const char *OPTI_STR_NOT_ITERATED = "Not-Iterated";
-static const char *OPTI_STR_PREPENDED_SALT = "Prepended-Salt";
-static const char *OPTI_STR_APPENDED_SALT = "Appended-Salt";
-static const char *OPTI_STR_SINGLE_HASH = "Single-Hash";
-static const char *OPTI_STR_SINGLE_SALT = "Single-Salt";
-static const char *OPTI_STR_BRUTE_FORCE = "Brute-Force";
-static const char *OPTI_STR_RAW_HASH = "Raw-Hash";
-static const char *OPTI_STR_SLOW_HASH_SIMD_INIT = "Slow-Hash-SIMD-INIT";
-static const char *OPTI_STR_SLOW_HASH_SIMD_LOOP = "Slow-Hash-SIMD-LOOP";
-static const char *OPTI_STR_SLOW_HASH_SIMD_COMP = "Slow-Hash-SIMD-COMP";
-static const char *OPTI_STR_USES_BITS_8 = "Uses-8-Bit";
-static const char *OPTI_STR_USES_BITS_16 = "Uses-16-Bit";
-static const char *OPTI_STR_USES_BITS_32 = "Uses-32-Bit";
-static const char *OPTI_STR_USES_BITS_64 = "Uses-64-Bit";
-
-static const char *HASH_CATEGORY_UNDEFINED_STR = "Undefined";
-static const char *HASH_CATEGORY_RAW_HASH_STR = "Raw Hash";
-static const char *HASH_CATEGORY_RAW_HASH_SALTED_STR = "Raw Hash, Salted and/or Iterated";
-static const char *HASH_CATEGORY_RAW_HASH_AUTHENTICATED_STR = "Raw Hash, Authenticated";
-static const char *HASH_CATEGORY_RAW_CIPHER_KPA_STR = "Raw Cipher, Known-Plaintext attack";
-static const char *HASH_CATEGORY_GENERIC_KDF_STR = "Generic KDF";
-static const char *HASH_CATEGORY_NETWORK_PROTOCOL_STR = "Network Protocols";
-static const char *HASH_CATEGORY_FORUM_SOFTWARE_STR = "Forums, CMS, E-Commerce, Frameworks";
-static const char *HASH_CATEGORY_DATABASE_SERVER_STR = "Database Server";
-static const char *HASH_CATEGORY_NETWORK_SERVER_STR = "FTP, HTTP, SMTP, LDAP Server";
-static const char *HASH_CATEGORY_RAW_CHECKSUM_STR = "Raw Checksum";
-static const char *HASH_CATEGORY_OS_STR = "Operating System";
-static const char *HASH_CATEGORY_EAS_STR = "Enterprise Application Software (EAS)";
-static const char *HASH_CATEGORY_ARCHIVE_STR = "Archives";
-static const char *HASH_CATEGORY_BACKUP_STR = "Backup";
-static const char *HASH_CATEGORY_FDE_STR = "Full-Disk Encryption (FDE)";
-static const char *HASH_CATEGORY_DOCUMENTS_STR = "Documents";
-static const char *HASH_CATEGORY_PASSWORD_MANAGER_STR = "Password Managers";
-static const char *HASH_CATEGORY_OTP_STR = "One-Time Passwords";
-static const char *HASH_CATEGORY_PLAIN_STR = "Plaintext";
-
/**
* parser
*/
@@ -278,70 +228,6 @@ int execute_keyboard_layout_mapping (u32 plain_buf[64], const int plain_len, key
return out_len;
}
-/**
- * output
- */
-
-const char *strhashcategory (const u32 hash_category)
-{
- switch (hash_category)
- {
- case HASH_CATEGORY_UNDEFINED: return HASH_CATEGORY_UNDEFINED_STR;
- case HASH_CATEGORY_RAW_HASH: return HASH_CATEGORY_RAW_HASH_STR;
- case HASH_CATEGORY_RAW_HASH_SALTED: return HASH_CATEGORY_RAW_HASH_SALTED_STR;
- case HASH_CATEGORY_RAW_HASH_AUTHENTICATED: return HASH_CATEGORY_RAW_HASH_AUTHENTICATED_STR;
- case HASH_CATEGORY_RAW_CIPHER_KPA: return HASH_CATEGORY_RAW_CIPHER_KPA_STR;
- case HASH_CATEGORY_GENERIC_KDF: return HASH_CATEGORY_GENERIC_KDF_STR;
- case HASH_CATEGORY_NETWORK_PROTOCOL: return HASH_CATEGORY_NETWORK_PROTOCOL_STR;
- case HASH_CATEGORY_FORUM_SOFTWARE: return HASH_CATEGORY_FORUM_SOFTWARE_STR;
- case HASH_CATEGORY_DATABASE_SERVER: return HASH_CATEGORY_DATABASE_SERVER_STR;
- case HASH_CATEGORY_NETWORK_SERVER: return HASH_CATEGORY_NETWORK_SERVER_STR;
- case HASH_CATEGORY_RAW_CHECKSUM: return HASH_CATEGORY_RAW_CHECKSUM_STR;
- case HASH_CATEGORY_OS: return HASH_CATEGORY_OS_STR;
- case HASH_CATEGORY_EAS: return HASH_CATEGORY_EAS_STR;
- case HASH_CATEGORY_ARCHIVE: return HASH_CATEGORY_ARCHIVE_STR;
- case HASH_CATEGORY_BACKUP: return HASH_CATEGORY_BACKUP_STR;
- case HASH_CATEGORY_FDE: return HASH_CATEGORY_FDE_STR;
- case HASH_CATEGORY_DOCUMENTS: return HASH_CATEGORY_DOCUMENTS_STR;
- case HASH_CATEGORY_PASSWORD_MANAGER: return HASH_CATEGORY_PASSWORD_MANAGER_STR;
- case HASH_CATEGORY_OTP: return HASH_CATEGORY_OTP_STR;
- case HASH_CATEGORY_PLAIN: return HASH_CATEGORY_PLAIN_STR;
- }
-
- return NULL;
-}
-
-const char *stroptitype (const u32 opti_type)
-{
- switch (opti_type)
- {
- case OPTI_TYPE_OPTIMIZED_KERNEL: return OPTI_STR_OPTIMIZED_KERNEL;
- case OPTI_TYPE_ZERO_BYTE: return OPTI_STR_ZERO_BYTE;
- case OPTI_TYPE_PRECOMPUTE_INIT: return OPTI_STR_PRECOMPUTE_INIT;
- case OPTI_TYPE_PRECOMPUTE_MERKLE: return OPTI_STR_PRECOMPUTE_MERKLE;
- case OPTI_TYPE_PRECOMPUTE_PERMUT: return OPTI_STR_PRECOMPUTE_PERMUT;
- case OPTI_TYPE_MEET_IN_MIDDLE: return OPTI_STR_MEET_IN_MIDDLE;
- case OPTI_TYPE_EARLY_SKIP: return OPTI_STR_EARLY_SKIP;
- case OPTI_TYPE_NOT_SALTED: return OPTI_STR_NOT_SALTED;
- case OPTI_TYPE_NOT_ITERATED: return OPTI_STR_NOT_ITERATED;
- case OPTI_TYPE_PREPENDED_SALT: return OPTI_STR_PREPENDED_SALT;
- case OPTI_TYPE_APPENDED_SALT: return OPTI_STR_APPENDED_SALT;
- case OPTI_TYPE_SINGLE_HASH: return OPTI_STR_SINGLE_HASH;
- case OPTI_TYPE_SINGLE_SALT: return OPTI_STR_SINGLE_SALT;
- case OPTI_TYPE_BRUTE_FORCE: return OPTI_STR_BRUTE_FORCE;
- case OPTI_TYPE_RAW_HASH: return OPTI_STR_RAW_HASH;
- case OPTI_TYPE_SLOW_HASH_SIMD_INIT: return OPTI_STR_SLOW_HASH_SIMD_INIT;
- case OPTI_TYPE_SLOW_HASH_SIMD_LOOP: return OPTI_STR_SLOW_HASH_SIMD_LOOP;
- case OPTI_TYPE_SLOW_HASH_SIMD_COMP: return OPTI_STR_SLOW_HASH_SIMD_COMP;
- case OPTI_TYPE_USES_BITS_8: return OPTI_STR_USES_BITS_8;
- case OPTI_TYPE_USES_BITS_16: return OPTI_STR_USES_BITS_16;
- case OPTI_TYPE_USES_BITS_32: return OPTI_STR_USES_BITS_32;
- case OPTI_TYPE_USES_BITS_64: return OPTI_STR_USES_BITS_64;
- }
-
- return NULL;
-}
-
/**
* parsing
*/
@@ -377,175 +263,6 @@ int ascii_digest (const hashconfig_t *hashconfig, const hashes_t *hashes, const
//salt_t salt;
/*
- if (opti_type & OPTI_TYPE_PRECOMPUTE_PERMUT)
- {
- u32 tt;
-
- switch (hash_type)
- {
- case HASH_TYPE_DES:
- FP (digest_buf[1], digest_buf[0], tt);
- break;
-
- case HASH_TYPE_DESCRYPT:
- FP (digest_buf[1], digest_buf[0], tt);
- break;
-
- case HASH_TYPE_DESRACF:
- digest_buf[0] = rotl32 (digest_buf[0], 29);
- digest_buf[1] = rotl32 (digest_buf[1], 29);
-
- FP (digest_buf[1], digest_buf[0], tt);
- break;
-
- case HASH_TYPE_LM:
- FP (digest_buf[1], digest_buf[0], tt);
- break;
-
- case HASH_TYPE_NETNTLM:
- digest_buf[0] = rotl32 (digest_buf[0], 29);
- digest_buf[1] = rotl32 (digest_buf[1], 29);
- digest_buf[2] = rotl32 (digest_buf[2], 29);
- digest_buf[3] = rotl32 (digest_buf[3], 29);
-
- FP (digest_buf[1], digest_buf[0], tt);
- FP (digest_buf[3], digest_buf[2], tt);
- break;
-
- case HASH_TYPE_BSDICRYPT:
- digest_buf[0] = rotl32 (digest_buf[0], 31);
- digest_buf[1] = rotl32 (digest_buf[1], 31);
-
- FP (digest_buf[1], digest_buf[0], tt);
- break;
- }
- }
-
- if (opti_type & OPTI_TYPE_PRECOMPUTE_MERKLE)
- {
- switch (hash_type)
- {
- case HASH_TYPE_MD4:
- digest_buf[0] += MD4M_A;
- digest_buf[1] += MD4M_B;
- digest_buf[2] += MD4M_C;
- digest_buf[3] += MD4M_D;
- break;
-
- case HASH_TYPE_MD5:
- digest_buf[0] += MD5M_A;
- digest_buf[1] += MD5M_B;
- digest_buf[2] += MD5M_C;
- digest_buf[3] += MD5M_D;
- break;
-
- case HASH_TYPE_SHA1:
- digest_buf[0] += SHA1M_A;
- digest_buf[1] += SHA1M_B;
- digest_buf[2] += SHA1M_C;
- digest_buf[3] += SHA1M_D;
- digest_buf[4] += SHA1M_E;
- break;
-
- case HASH_TYPE_SHA224:
- digest_buf[0] += SHA224M_A;
- digest_buf[1] += SHA224M_B;
- digest_buf[2] += SHA224M_C;
- digest_buf[3] += SHA224M_D;
- digest_buf[4] += SHA224M_E;
- digest_buf[5] += SHA224M_F;
- digest_buf[6] += SHA224M_G;
- break;
-
- case HASH_TYPE_SHA256:
- digest_buf[0] += SHA256M_A;
- digest_buf[1] += SHA256M_B;
- digest_buf[2] += SHA256M_C;
- digest_buf[3] += SHA256M_D;
- digest_buf[4] += SHA256M_E;
- digest_buf[5] += SHA256M_F;
- digest_buf[6] += SHA256M_G;
- digest_buf[7] += SHA256M_H;
- break;
-
- case HASH_TYPE_SHA384:
- digest_buf64[0] += SHA384M_A;
- digest_buf64[1] += SHA384M_B;
- digest_buf64[2] += SHA384M_C;
- digest_buf64[3] += SHA384M_D;
- digest_buf64[4] += SHA384M_E;
- digest_buf64[5] += SHA384M_F;
- digest_buf64[6] += 0;
- digest_buf64[7] += 0;
- break;
-
- case HASH_TYPE_SHA512:
- digest_buf64[0] += SHA512M_A;
- digest_buf64[1] += SHA512M_B;
- digest_buf64[2] += SHA512M_C;
- digest_buf64[3] += SHA512M_D;
- digest_buf64[4] += SHA512M_E;
- digest_buf64[5] += SHA512M_F;
- digest_buf64[6] += SHA512M_G;
- digest_buf64[7] += SHA512M_H;
- break;
- }
- }
-
- if (opts_type & OPTS_TYPE_PT_GENERATE_LE)
- {
- if (dgst_size == DGST_SIZE_4_2)
- {
- for (int i = 0; i < 2; i++) digest_buf[i] = byte_swap_32 (digest_buf[i]);
- }
- else if (dgst_size == DGST_SIZE_4_4)
- {
- for (int i = 0; i < 4; i++) digest_buf[i] = byte_swap_32 (digest_buf[i]);
- }
- else if (dgst_size == DGST_SIZE_4_5)
- {
- for (int i = 0; i < 5; i++) digest_buf[i] = byte_swap_32 (digest_buf[i]);
- }
- else if (dgst_size == DGST_SIZE_4_6)
- {
- for (int i = 0; i < 6; i++) digest_buf[i] = byte_swap_32 (digest_buf[i]);
- }
- else if (dgst_size == DGST_SIZE_4_7)
- {
- for (int i = 0; i < 7; i++) digest_buf[i] = byte_swap_32 (digest_buf[i]);
- }
- else if (dgst_size == DGST_SIZE_4_8)
- {
- for (int i = 0; i < 8; i++) digest_buf[i] = byte_swap_32 (digest_buf[i]);
- }
- else if ((dgst_size == DGST_SIZE_4_16) || (dgst_size == DGST_SIZE_8_8)) // same size, same result :)
- {
- if (hash_type == HASH_TYPE_WHIRLPOOL)
- {
- for (int i = 0; i < 16; i++) digest_buf[i] = byte_swap_32 (digest_buf[i]);
- }
- else if (hash_type == HASH_TYPE_SHA384)
- {
- for (int i = 0; i < 8; i++) digest_buf64[i] = byte_swap_64 (digest_buf64[i]);
- }
- else if (hash_type == HASH_TYPE_SHA512)
- {
- for (int i = 0; i < 8; i++) digest_buf64[i] = byte_swap_64 (digest_buf64[i]);
- }
- else if (hash_type == HASH_TYPE_GOST)
- {
- for (int i = 0; i < 16; i++) digest_buf[i] = byte_swap_32 (digest_buf[i]);
- }
- }
- else if (dgst_size == DGST_SIZE_4_64)
- {
- for (int i = 0; i < 64; i++) digest_buf[i] = byte_swap_32 (digest_buf[i]);
- }
- else if (dgst_size == DGST_SIZE_8_25)
- {
- for (int i = 0; i < 25; i++) digest_buf64[i] = byte_swap_64 (digest_buf64[i]);
- }
- }
const bool isSalted = ((hashconfig->salt_type == SALT_TYPE_GENERIC)
| (hashconfig->salt_type == SALT_TYPE_EMBEDDED));
@@ -652,6 +369,8 @@ static bool module_load (hashcat_ctx_t *hashcat_ctx, module_ctx_t *module_ctx, c
{
const folder_config_t *folder_config = hashcat_ctx->folder_config;
+ memset (module_ctx, 0, sizeof (module_ctx_t));
+
char *module_file = (char *) hcmalloc (HCBUFSIZ_TINY);
#if defined (_WIN)
@@ -705,20 +424,11 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
// set some boring defaults
- hashconfig->attack_exec = default_attack_exec (hashconfig, user_options, user_options_extra);
hashconfig->benchmark_mask = default_benchmark_mask (hashconfig, user_options, user_options_extra);
- hashconfig->dgst_pos0 = default_dgst_pos0 (hashconfig, user_options, user_options_extra);
- hashconfig->dgst_pos1 = default_dgst_pos1 (hashconfig, user_options, user_options_extra);
- hashconfig->dgst_pos2 = default_dgst_pos2 (hashconfig, user_options, user_options_extra);
- hashconfig->dgst_pos3 = default_dgst_pos3 (hashconfig, user_options, user_options_extra);
- hashconfig->dgst_size = default_dgst_size (hashconfig, user_options, user_options_extra);
hashconfig->dictstat_disable = default_dictstat_disable (hashconfig, user_options, user_options_extra);
hashconfig->esalt_size = default_esalt_size (hashconfig, user_options, user_options_extra);
hashconfig->forced_outfile_format = default_forced_outfile_format (hashconfig, user_options, user_options_extra);
- hashconfig->hash_category = default_hash_category (hashconfig, user_options, user_options_extra);
hashconfig->hash_mode = default_hash_mode (hashconfig, user_options, user_options_extra);
- hashconfig->hash_name = default_hash_name (hashconfig, user_options, user_options_extra);
- hashconfig->hash_type = default_hash_type (hashconfig, user_options, user_options_extra);
hashconfig->hlfmt_disable = default_hlfmt_disable (hashconfig, user_options, user_options_extra);
hashconfig->hook_salt_size = default_hook_salt_size (hashconfig, user_options, user_options_extra);
hashconfig->hook_size = default_hook_size (hashconfig, user_options, user_options_extra);
@@ -728,18 +438,12 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
hashconfig->kernel_loops_max = default_kernel_loops_max (hashconfig, user_options, user_options_extra);
hashconfig->kernel_threads_min = default_kernel_threads_min (hashconfig, user_options, user_options_extra);
hashconfig->kernel_threads_max = default_kernel_threads_max (hashconfig, user_options, user_options_extra);
- hashconfig->kern_type = default_kern_type (hashconfig, user_options, user_options_extra);
- hashconfig->opti_type = default_opti_type (hashconfig, user_options, user_options_extra);
- hashconfig->opts_type = default_opts_type (hashconfig, user_options, user_options_extra);
hashconfig->outfile_check_disable = default_outfile_check_disable (hashconfig, user_options, user_options_extra);
hashconfig->outfile_check_nocomp = default_outfile_check_nocomp (hashconfig, user_options, user_options_extra);
hashconfig->potfile_disable = default_potfile_disable (hashconfig, user_options, user_options_extra);
hashconfig->potfile_keep_all_hashes = default_potfile_keep_all_hashes (hashconfig, user_options, user_options_extra);
hashconfig->pwdump_column = default_pwdump_column (hashconfig, user_options, user_options_extra);
- hashconfig->salt_type = default_salt_type (hashconfig, user_options, user_options_extra);
hashconfig->separator = default_separator (hashconfig, user_options, user_options_extra);
- hashconfig->st_hash = default_st_hash (hashconfig, user_options, user_options_extra);
- hashconfig->st_pass = default_st_pass (hashconfig, user_options, user_options_extra);
hashconfig->tmp_size = default_tmp_size (hashconfig, user_options, user_options_extra);
hashconfig->unstable_warning = default_unstable_warning (hashconfig, user_options, user_options_extra);
hashconfig->warmup_disable = default_warmup_disable (hashconfig, user_options, user_options_extra);
@@ -752,13 +456,163 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
module_ctx->module_init (module_ctx);
- if (module_ctx->module_interface_version < MODULE_INTERFACE_VERSION_MINIMUM)
+ if (module_ctx->module_context_size != MODULE_CONTEXT_SIZE_CURRENT)
{
- event_log_error (hashcat_ctx, "module version current (%u) older than minimum (%u)", module_ctx->module_interface_version, MODULE_INTERFACE_VERSION_MINIMUM);
+ event_log_error (hashcat_ctx, "module context size is invalid, outdated template?");
return -1;
}
+ if (module_ctx->module_interface_version < MODULE_INTERFACE_VERSION_MINIMUM)
+ {
+ event_log_error (hashcat_ctx, "module interface version is outdated, please compile");
+
+ return -1;
+ }
+
+ // check for missing pointer assignements
+
+ const size_t ptr_sz = sizeof (void *);
+
+ char *zbuf = (char *) hcmalloc (ptr_sz);
+
+ char *mpa_check = (char *) module_ctx;
+
+ for (size_t i = 0; i < sizeof (module_ctx_t) - ptr_sz; i++)
+ {
+ if (memcmp (mpa_check, zbuf, ptr_sz) == 0)
+ {
+ event_log_error (hashcat_ctx, "module context initialization is invalid, outdated template?");
+
+ return -1;
+ }
+
+ mpa_check++;
+ }
+
+ hcfree (zbuf);
+
+ // mandatory functions check
+
+ if (module_ctx->module_attack_exec == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_attack_exec'");
+
+ return false;
+ }
+
+ if (module_ctx->module_dgst_pos0 == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_dgst_pos0'");
+
+ return false;
+ }
+
+ if (module_ctx->module_dgst_pos1 == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_dgst_pos1'");
+
+ return false;
+ }
+
+ if (module_ctx->module_dgst_pos2 == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_dgst_pos2'");
+
+ return false;
+ }
+
+ if (module_ctx->module_dgst_pos3 == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_dgst_pos3'");
+
+ return false;
+ }
+
+ if (module_ctx->module_dgst_size == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_dgst_size'");
+
+ return false;
+ }
+
+ if (module_ctx->module_hash_decode == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_hash_decode'");
+
+ return false;
+ }
+
+ if (module_ctx->module_hash_encode == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_hash_encode'");
+
+ return false;
+ }
+
+ if (module_ctx->module_hash_category == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_hash_category'");
+
+ return false;
+ }
+
+ if (module_ctx->module_hash_name == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_hash_name'");
+
+ return false;
+ }
+
+ if (module_ctx->module_hash_type == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_hash_type'");
+
+ return false;
+ }
+
+ if (module_ctx->module_kern_type == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_kern_type'");
+
+ return false;
+ }
+
+ if (module_ctx->module_opti_type == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_opti_type'");
+
+ return false;
+ }
+
+ if (module_ctx->module_opts_type == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_opts_type'");
+
+ return false;
+ }
+
+ if (module_ctx->module_salt_type == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_salt_type'");
+
+ return false;
+ }
+
+ if (module_ctx->module_st_hash == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_st_hash'");
+
+ return false;
+ }
+
+ if (module_ctx->module_st_pass == MODULE_DEFAULT)
+ {
+ event_log_error (hashcat_ctx, "Cannot find mandatory symbol 'module_st_pass'");
+
+ return false;
+ }
+
if (module_ctx->module_attack_exec != MODULE_DEFAULT) hashconfig->attack_exec = module_ctx->module_attack_exec (hashconfig, user_options, user_options_extra);
if (module_ctx->module_benchmark_mask != MODULE_DEFAULT) hashconfig->benchmark_mask = module_ctx->module_benchmark_mask (hashconfig, user_options, user_options_extra);
if (module_ctx->module_dgst_pos0 != MODULE_DEFAULT) hashconfig->dgst_pos0 = module_ctx->module_dgst_pos0 (hashconfig, user_options, user_options_extra);
@@ -934,6 +788,17 @@ void hashconfig_destroy (hashcat_ctx_t *hashcat_ctx)
memset (hashconfig, 0, sizeof (hashconfig_t));
}
+/**
+ * default functions
+ */
+
+const char *default_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";
+
+ return mask;
+}
+
u32 default_hash_mode (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 hash_mode = user_options->hash_mode;
@@ -941,67 +806,159 @@ u32 default_hash_mode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED
return hash_mode;
}
-u32 default_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)
+u64 default_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 attack_exec = ATTACK_EXEC_INSIDE_KERNEL;
+ const u64 tmp_size = 4;
- return attack_exec;
+ return tmp_size;
}
-u32 default_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)
+u64 default_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 u32 dgst_pos0 = 0;
+ const u64 esalt_size = 0;
- return dgst_pos0;
+ return esalt_size;
}
-u32 default_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 default_kernel_accel_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 u32 dgst_pos1 = 1;
+ const u32 kernel_accel_min = KERNEL_ACCEL_MIN;
- return dgst_pos1;
+ return kernel_accel_min;
}
-u32 default_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 default_kernel_accel_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 u32 dgst_pos2 = 2;
+ const u32 kernel_accel_max = KERNEL_ACCEL_MAX;
- return dgst_pos2;
+ return kernel_accel_max;
}
-u32 default_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 default_kernel_loops_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 u32 dgst_pos3 = 3;
+ const u32 kernel_loops_min = KERNEL_LOOPS_MIN;
- return dgst_pos3;
+ return kernel_loops_min;
}
-u32 default_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)
+u32 default_kernel_loops_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 u32 dgst_size = DGST_SIZE_4_4;
+ const u32 kernel_loops_max = KERNEL_LOOPS_MAX;
- return dgst_size;
+ return kernel_loops_max;
}
-u32 default_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)
+u32 default_kernel_threads_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 u32 hash_type = 0;
+ const u32 kernel_threads_min = KERNEL_THREADS_MIN;
- return hash_type;
+ return kernel_threads_min;
}
-const char *default_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 default_kernel_threads_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 char *hash_name = "<empty default>";
+ const u32 kernel_threads_max = KERNEL_THREADS_MAX;
- return hash_name;
+ return kernel_threads_max;
}
-u32 default_hash_category (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 default_forced_outfile_format (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 hash_category = HASH_CATEGORY_UNDEFINED;
+ const u32 forced_outfile_format = user_options->outfile_format;
- return hash_category;
+ return forced_outfile_format;
+}
+
+u64 default_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 default_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;
+}
+
+char default_separator (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 user_options->separator;
+}
+
+bool default_dictstat_disable (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 dictstat_disable = false;
+
+ return dictstat_disable;
+}
+
+bool default_warmup_disable (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 warmup_disable = false;
+
+ return warmup_disable;
+}
+
+bool default_outfile_check_disable (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 outfile_check_disable = false;
+
+ return outfile_check_disable;
+}
+
+bool default_outfile_check_nocomp (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 outfile_check_nocomp = false;
+
+ return outfile_check_nocomp;
+}
+
+bool default_hlfmt_disable (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 hlfmt_disable = false;
+
+ return hlfmt_disable;
+}
+
+bool default_potfile_keep_all_hashes (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
+{
+ bool potfile_keep_all_hashes = false;
+
+ // keep all hashes if --username was combined with --left or --show
+
+ if (user_options->username == true)
+ {
+ if ((user_options->show == true) || (user_options->left == true))
+ {
+ potfile_keep_all_hashes = true;
+ }
+ }
+
+ return potfile_keep_all_hashes;
+}
+
+u32 default_pwdump_column (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 pwdump_column = PWDUMP_COLUMN_INVALID;
+
+ return pwdump_column;
+}
+
+bool default_potfile_disable (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 potfile_disable = false;
+
+ return potfile_disable;
+}
+
+bool default_unstable_warning (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 unstable_warning = false;
+
+ return unstable_warning;
}
u32 default_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)
@@ -1140,203 +1097,3 @@ u32 default_salt_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED
return salt_max;
}
-
-const char *default_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";
-
- return mask;
-}
-
-u32 default_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 default_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;
-}
-
-u64 default_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)
-{
- const u64 kern_type = 0;
-
- return kern_type;
-}
-
-u64 default_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 u64 tmp_size = 4;
-
- return tmp_size;
-}
-
-u64 default_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 default_kernel_accel_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 u32 kernel_accel_min = KERNEL_ACCEL_MIN;
-
- return kernel_accel_min;
-}
-
-u32 default_kernel_accel_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 u32 kernel_accel_max = KERNEL_ACCEL_MAX;
-
- return kernel_accel_max;
-}
-
-u32 default_kernel_loops_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 u32 kernel_loops_min = KERNEL_LOOPS_MIN;
-
- return kernel_loops_min;
-}
-
-u32 default_kernel_loops_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 u32 kernel_loops_max = KERNEL_LOOPS_MAX;
-
- return kernel_loops_max;
-}
-
-u32 default_kernel_threads_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 u32 kernel_threads_min = KERNEL_THREADS_MIN;
-
- return kernel_threads_min;
-}
-
-u32 default_kernel_threads_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 u32 kernel_threads_max = KERNEL_THREADS_MAX;
-
- return kernel_threads_max;
-}
-
-u32 default_forced_outfile_format (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 forced_outfile_format = user_options->outfile_format;
-
- return forced_outfile_format;
-}
-
-u32 default_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 default_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 default_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;
-}
-
-char default_separator (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 user_options->separator;
-}
-
-const char *default_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 "<empty default>";
-}
-
-const char *default_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_HASHCAT_PLAIN;
-}
-
-bool default_dictstat_disable (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 dictstat_disable = false;
-
- return dictstat_disable;
-}
-
-bool default_warmup_disable (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 warmup_disable = false;
-
- return warmup_disable;
-}
-
-bool default_outfile_check_disable (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 outfile_check_disable = false;
-
- return outfile_check_disable;
-}
-
-bool default_outfile_check_nocomp (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 outfile_check_nocomp = false;
-
- return outfile_check_nocomp;
-}
-
-bool default_hlfmt_disable (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 hlfmt_disable = false;
-
- return hlfmt_disable;
-}
-
-bool default_potfile_keep_all_hashes (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
-{
- bool potfile_keep_all_hashes = false;
-
- // keep all hashes if --username was combined with --left or --show
-
- if (user_options->username == true)
- {
- if ((user_options->show == true) || (user_options->left == true))
- {
- potfile_keep_all_hashes = true;
- }
- }
-
- return potfile_keep_all_hashes;
-}
-
-u32 default_pwdump_column (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 pwdump_column = PWDUMP_COLUMN_INVALID;
-
- return pwdump_column;
-}
-
-bool default_potfile_disable (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 potfile_disable = false;
-
- return potfile_disable;
-}
-
-bool default_unstable_warning (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 unstable_warning = false;
-
- return unstable_warning;
-}
diff --git a/src/interface_migrate.c b/src/interface_migrate.c
index ccf54ae75..8874145b9 100644
--- a/src/interface_migrate.c
+++ b/src/interface_migrate.c
@@ -280,6 +280,11 @@
" 99999 | Plaintext | Plaintext",
+static const char *ST_PASS_HASHCAT_PLAIN = "hashcat";
+static const char *ST_PASS_HASHCAT_EXCL = "hashcat!";
+static const char *ST_PASS_HASHCAT_EXCL3 = "hashcat!!!";
+static const char *ST_PASS_HASHCAT_ONE = "hashcat1";
+static const char *ST_PASS_HASHCAT_ONET3 = "hashcat1hashcat1hashcat1";
static const char *ST_PASS_HEX_02501 = "7f620a599c445155935a35634638fa67b4aafecb92e0bd8625388757a63c2dda";
static const char *ST_PASS_BIN_09710 = "\x91\xb2\xe0\x62\xb9";
diff --git a/src/shared.c b/src/shared.c
index e1bebbb7f..f136edc73 100644
--- a/src/shared.c
+++ b/src/shared.c
@@ -54,6 +54,50 @@ static const char *PA_035 = "Token length exception";
static const char *PA_036 = "Insufficient entropy exception";
static const char *PA_255 = "Unknown error";
+static const char *OPTI_STR_OPTIMIZED_KERNEL = "Optimized-Kernel";
+static const char *OPTI_STR_ZERO_BYTE = "Zero-Byte";
+static const char *OPTI_STR_PRECOMPUTE_INIT = "Precompute-Init";
+static const char *OPTI_STR_PRECOMPUTE_MERKLE = "Precompute-Merkle-Demgard";
+static const char *OPTI_STR_PRECOMPUTE_PERMUT = "Precompute-Final-Permutation";
+static const char *OPTI_STR_MEET_IN_MIDDLE = "Meet-In-The-Middle";
+static const char *OPTI_STR_EARLY_SKIP = "Early-Skip";
+static const char *OPTI_STR_NOT_SALTED = "Not-Salted";
+static const char *OPTI_STR_NOT_ITERATED = "Not-Iterated";
+static const char *OPTI_STR_PREPENDED_SALT = "Prepended-Salt";
+static const char *OPTI_STR_APPENDED_SALT = "Appended-Salt";
+static const char *OPTI_STR_SINGLE_HASH = "Single-Hash";
+static const char *OPTI_STR_SINGLE_SALT = "Single-Salt";
+static const char *OPTI_STR_BRUTE_FORCE = "Brute-Force";
+static const char *OPTI_STR_RAW_HASH = "Raw-Hash";
+static const char *OPTI_STR_SLOW_HASH_SIMD_INIT = "Slow-Hash-SIMD-INIT";
+static const char *OPTI_STR_SLOW_HASH_SIMD_LOOP = "Slow-Hash-SIMD-LOOP";
+static const char *OPTI_STR_SLOW_HASH_SIMD_COMP = "Slow-Hash-SIMD-COMP";
+static const char *OPTI_STR_USES_BITS_8 = "Uses-8-Bit";
+static const char *OPTI_STR_USES_BITS_16 = "Uses-16-Bit";
+static const char *OPTI_STR_USES_BITS_32 = "Uses-32-Bit";
+static const char *OPTI_STR_USES_BITS_64 = "Uses-64-Bit";
+
+static const char *HASH_CATEGORY_UNDEFINED_STR = "Undefined";
+static const char *HASH_CATEGORY_RAW_HASH_STR = "Raw Hash";
+static const char *HASH_CATEGORY_RAW_HASH_SALTED_STR = "Raw Hash, Salted and/or Iterated";
+static const char *HASH_CATEGORY_RAW_HASH_AUTHENTICATED_STR = "Raw Hash, Authenticated";
+static const char *HASH_CATEGORY_RAW_CIPHER_KPA_STR = "Raw Cipher, Known-Plaintext attack";
+static const char *HASH_CATEGORY_GENERIC_KDF_STR = "Generic KDF";
+static const char *HASH_CATEGORY_NETWORK_PROTOCOL_STR = "Network Protocols";
+static const char *HASH_CATEGORY_FORUM_SOFTWARE_STR = "Forums, CMS, E-Commerce, Frameworks";
+static const char *HASH_CATEGORY_DATABASE_SERVER_STR = "Database Server";
+static const char *HASH_CATEGORY_NETWORK_SERVER_STR = "FTP, HTTP, SMTP, LDAP Server";
+static const char *HASH_CATEGORY_RAW_CHECKSUM_STR = "Raw Checksum";
+static const char *HASH_CATEGORY_OS_STR = "Operating System";
+static const char *HASH_CATEGORY_EAS_STR = "Enterprise Application Software (EAS)";
+static const char *HASH_CATEGORY_ARCHIVE_STR = "Archives";
+static const char *HASH_CATEGORY_BACKUP_STR = "Backup";
+static const char *HASH_CATEGORY_FDE_STR = "Full-Disk Encryption (FDE)";
+static const char *HASH_CATEGORY_DOCUMENTS_STR = "Documents";
+static const char *HASH_CATEGORY_PASSWORD_MANAGER_STR = "Password Managers";
+static const char *HASH_CATEGORY_OTP_STR = "One-Time Passwords";
+static const char *HASH_CATEGORY_PLAIN_STR = "Plaintext";
+
static inline int get_msb32 (const u32 v)
{
int i;
@@ -843,6 +887,66 @@ int select_read_timeout_console (const int sec)
#endif
+const char *strhashcategory (const u32 hash_category)
+{
+ switch (hash_category)
+ {
+ case HASH_CATEGORY_UNDEFINED: return HASH_CATEGORY_UNDEFINED_STR;
+ case HASH_CATEGORY_RAW_HASH: return HASH_CATEGORY_RAW_HASH_STR;
+ case HASH_CATEGORY_RAW_HASH_SALTED: return HASH_CATEGORY_RAW_HASH_SALTED_STR;
+ case HASH_CATEGORY_RAW_HASH_AUTHENTICATED: return HASH_CATEGORY_RAW_HASH_AUTHENTICATED_STR;
+ case HASH_CATEGORY_RAW_CIPHER_KPA: return HASH_CATEGORY_RAW_CIPHER_KPA_STR;
+ case HASH_CATEGORY_GENERIC_KDF: return HASH_CATEGORY_GENERIC_KDF_STR;
+ case HASH_CATEGORY_NETWORK_PROTOCOL: return HASH_CATEGORY_NETWORK_PROTOCOL_STR;
+ case HASH_CATEGORY_FORUM_SOFTWARE: return HASH_CATEGORY_FORUM_SOFTWARE_STR;
+ case HASH_CATEGORY_DATABASE_SERVER: return HASH_CATEGORY_DATABASE_SERVER_STR;
+ case HASH_CATEGORY_NETWORK_SERVER: return HASH_CATEGORY_NETWORK_SERVER_STR;
+ case HASH_CATEGORY_RAW_CHECKSUM: return HASH_CATEGORY_RAW_CHECKSUM_STR;
+ case HASH_CATEGORY_OS: return HASH_CATEGORY_OS_STR;
+ case HASH_CATEGORY_EAS: return HASH_CATEGORY_EAS_STR;
+ case HASH_CATEGORY_ARCHIVE: return HASH_CATEGORY_ARCHIVE_STR;
+ case HASH_CATEGORY_BACKUP: return HASH_CATEGORY_BACKUP_STR;
+ case HASH_CATEGORY_FDE: return HASH_CATEGORY_FDE_STR;
+ case HASH_CATEGORY_DOCUMENTS: return HASH_CATEGORY_DOCUMENTS_STR;
+ case HASH_CATEGORY_PASSWORD_MANAGER: return HASH_CATEGORY_PASSWORD_MANAGER_STR;
+ case HASH_CATEGORY_OTP: return HASH_CATEGORY_OTP_STR;
+ case HASH_CATEGORY_PLAIN: return HASH_CATEGORY_PLAIN_STR;
+ }
+
+ return NULL;
+}
+
+const char *stroptitype (const u32 opti_type)
+{
+ switch (opti_type)
+ {
+ case OPTI_TYPE_OPTIMIZED_KERNEL: return OPTI_STR_OPTIMIZED_KERNEL;
+ case OPTI_TYPE_ZERO_BYTE: return OPTI_STR_ZERO_BYTE;
+ case OPTI_TYPE_PRECOMPUTE_INIT: return OPTI_STR_PRECOMPUTE_INIT;
+ case OPTI_TYPE_PRECOMPUTE_MERKLE: return OPTI_STR_PRECOMPUTE_MERKLE;
+ case OPTI_TYPE_PRECOMPUTE_PERMUT: return OPTI_STR_PRECOMPUTE_PERMUT;
+ case OPTI_TYPE_MEET_IN_MIDDLE: return OPTI_STR_MEET_IN_MIDDLE;
+ case OPTI_TYPE_EARLY_SKIP: return OPTI_STR_EARLY_SKIP;
+ case OPTI_TYPE_NOT_SALTED: return OPTI_STR_NOT_SALTED;
+ case OPTI_TYPE_NOT_ITERATED: return OPTI_STR_NOT_ITERATED;
+ case OPTI_TYPE_PREPENDED_SALT: return OPTI_STR_PREPENDED_SALT;
+ case OPTI_TYPE_APPENDED_SALT: return OPTI_STR_APPENDED_SALT;
+ case OPTI_TYPE_SINGLE_HASH: return OPTI_STR_SINGLE_HASH;
+ case OPTI_TYPE_SINGLE_SALT: return OPTI_STR_SINGLE_SALT;
+ case OPTI_TYPE_BRUTE_FORCE: return OPTI_STR_BRUTE_FORCE;
+ case OPTI_TYPE_RAW_HASH: return OPTI_STR_RAW_HASH;
+ case OPTI_TYPE_SLOW_HASH_SIMD_INIT: return OPTI_STR_SLOW_HASH_SIMD_INIT;
+ case OPTI_TYPE_SLOW_HASH_SIMD_LOOP: return OPTI_STR_SLOW_HASH_SIMD_LOOP;
+ case OPTI_TYPE_SLOW_HASH_SIMD_COMP: return OPTI_STR_SLOW_HASH_SIMD_COMP;
+ case OPTI_TYPE_USES_BITS_8: return OPTI_STR_USES_BITS_8;
+ case OPTI_TYPE_USES_BITS_16: return OPTI_STR_USES_BITS_16;
+ case OPTI_TYPE_USES_BITS_32: return OPTI_STR_USES_BITS_32;
+ case OPTI_TYPE_USES_BITS_64: return OPTI_STR_USES_BITS_64;
+ }
+
+ return NULL;
+}
+
const char *strparser (const u32 parser_status)
{
switch (parser_status)
diff --git a/src/usage.c b/src/usage.c
index b71522043..3fea6b79a 100644
--- a/src/usage.c
+++ b/src/usage.c
@@ -251,10 +251,7 @@ static int sort_by_usage (const void *p1, const void *p2)
if (u1->hash_category > u2->hash_category) return 1;
if (u1->hash_category < u2->hash_category) return -1;
- if (u1->hash_mode > u2->hash_mode) return 1;
- if (u1->hash_mode < u2->hash_mode) return -1;
-
- return 0;
+ return strcmp (u1->hash_name, u2->hash_name);
}
void usage_mini_print (const char *progname)
@@ -273,7 +270,6 @@ void usage_big_print (hashcat_ctx_t *hashcat_ctx)
hashconfig_t *hashconfig = hashcat_ctx->hashconfig;
user_options_t *user_options = hashcat_ctx->user_options;
-
char *modulefile = (char *) hcmalloc (HCBUFSIZ_TINY);
usage_sort_t *usage_sort_buf = (usage_sort_t *) hccalloc (MODULE_HASH_MODES_MAXIMUM, sizeof (usage_sort_t));