|
|
@ -17,11 +17,8 @@ static const u32 DGST_POS1 = 3;
|
|
|
|
static const u32 DGST_POS2 = 2;
|
|
|
|
static const u32 DGST_POS2 = 2;
|
|
|
|
static const u32 DGST_POS3 = 1;
|
|
|
|
static const u32 DGST_POS3 = 1;
|
|
|
|
static const u32 DGST_SIZE = DGST_SIZE_4_4;
|
|
|
|
static const u32 DGST_SIZE = DGST_SIZE_4_4;
|
|
|
|
static const u64 ESALT_SIZE = 0;
|
|
|
|
|
|
|
|
static const char *HASH_NAME = "NTLM";
|
|
|
|
static const char *HASH_NAME = "NTLM";
|
|
|
|
static const u32 HASH_TYPE = HASH_TYPE_MD4;
|
|
|
|
static const u32 HASH_TYPE = HASH_TYPE_MD4;
|
|
|
|
static const u64 HOOK_SALT_SIZE = 0;
|
|
|
|
|
|
|
|
static const u64 HOOK_SIZE = 0;
|
|
|
|
|
|
|
|
static const u32 KERN_TYPE = 1000;
|
|
|
|
static const u32 KERN_TYPE = 1000;
|
|
|
|
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
|
|
|
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
|
|
|
| OPTI_TYPE_PRECOMPUTE_INIT
|
|
|
|
| OPTI_TYPE_PRECOMPUTE_INIT
|
|
|
@ -35,10 +32,38 @@ static const u32 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE
|
|
|
|
| OPTS_TYPE_PT_ADD80
|
|
|
|
| OPTS_TYPE_PT_ADD80
|
|
|
|
| OPTS_TYPE_PT_ADDBITS14
|
|
|
|
| OPTS_TYPE_PT_ADDBITS14
|
|
|
|
| OPTS_TYPE_PT_UTF16LE;
|
|
|
|
| OPTS_TYPE_PT_UTF16LE;
|
|
|
|
static const u32 SALT_TYPE = SALT_TYPE_NONE;
|
|
|
|
|
|
|
|
static const char *ST_HASH = "b4b9b02e6f09a9bd760f388b67351e2b";
|
|
|
|
static const char *ST_HASH = "b4b9b02e6f09a9bd760f388b67351e2b";
|
|
|
|
static const char *ST_PASS = "hashcat";
|
|
|
|
static const char *ST_PASS = "hashcat";
|
|
|
|
static const u64 TMP_SIZE = 0;
|
|
|
|
|
|
|
|
|
|
|
|
void module_register (module_ctx_t *module_ctx)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
module_ctx->module_attack_exec = module_attack_exec;
|
|
|
|
|
|
|
|
module_ctx->module_benchmark_mask = module_benchmark_mask;
|
|
|
|
|
|
|
|
module_ctx->module_benchmark_salt_len = module_benchmark_salt_len;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_pos0 = module_dgst_pos0;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_pos1 = module_dgst_pos1;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_pos2 = module_dgst_pos2;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_pos3 = module_dgst_pos3;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_size = module_dgst_size;
|
|
|
|
|
|
|
|
module_ctx->module_esalt_size = module_esalt_size;
|
|
|
|
|
|
|
|
module_ctx->module_hash_decode = module_hash_decode;
|
|
|
|
|
|
|
|
module_ctx->module_hash_encode = module_hash_encode;
|
|
|
|
|
|
|
|
module_ctx->module_hash_name = module_hash_name;
|
|
|
|
|
|
|
|
module_ctx->module_hash_type = module_hash_type;
|
|
|
|
|
|
|
|
module_ctx->module_hook_salt_size = module_hook_salt_size;
|
|
|
|
|
|
|
|
module_ctx->module_hook_size = module_hook_size;
|
|
|
|
|
|
|
|
module_ctx->module_kern_type = module_kern_type;
|
|
|
|
|
|
|
|
module_ctx->module_opti_type = module_opti_type;
|
|
|
|
|
|
|
|
module_ctx->module_opts_type = module_opts_type;
|
|
|
|
|
|
|
|
module_ctx->module_pw_max = module_pw_max;
|
|
|
|
|
|
|
|
module_ctx->module_pw_min = module_pw_min;
|
|
|
|
|
|
|
|
module_ctx->module_salt_max = module_salt_max;
|
|
|
|
|
|
|
|
module_ctx->module_salt_min = module_salt_min;
|
|
|
|
|
|
|
|
module_ctx->module_salt_type = module_salt_type;
|
|
|
|
|
|
|
|
module_ctx->module_st_hash = module_st_hash;
|
|
|
|
|
|
|
|
module_ctx->module_st_pass = module_st_pass;
|
|
|
|
|
|
|
|
module_ctx->module_tmp_size = module_tmp_size;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ATTACK_EXEC; }
|
|
|
|
u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ATTACK_EXEC; }
|
|
|
|
u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS0; }
|
|
|
|
u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS0; }
|
|
|
@ -46,45 +71,79 @@ u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig,
|
|
|
|
u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS2; }
|
|
|
|
u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS2; }
|
|
|
|
u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS3; }
|
|
|
|
u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS3; }
|
|
|
|
u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_SIZE; }
|
|
|
|
u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_SIZE; }
|
|
|
|
u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ESALT_SIZE; }
|
|
|
|
|
|
|
|
const char *module_hash_name (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_NAME; }
|
|
|
|
const char *module_hash_name (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_NAME; }
|
|
|
|
u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_TYPE; }
|
|
|
|
u32 module_hash_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_TYPE; }
|
|
|
|
u64 module_hook_salt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HOOK_SALT_SIZE; }
|
|
|
|
|
|
|
|
u64 module_hook_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HOOK_SIZE; }
|
|
|
|
|
|
|
|
u64 module_kern_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return KERN_TYPE; }
|
|
|
|
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_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; }
|
|
|
|
const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS; }
|
|
|
|
u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return TMP_SIZE; }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_salt_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL);
|
|
|
|
//return hashconfig_opti_type (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
|
|
|
|
return hashconfig_salt_min (hashconfig, user_options, user_options_extra, optimized_kernel);
|
|
|
|
return OPTI_TYPE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_salt_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
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)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL);
|
|
|
|
//return hashconfig_opts_type (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
|
|
|
|
return hashconfig_salt_max (hashconfig, user_options, user_options_extra, optimized_kernel);
|
|
|
|
return OPTS_TYPE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_pw_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
u32 module_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 bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL);
|
|
|
|
return hashconfig_salt_type (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return hashconfig_pw_min (hashconfig, user_options, user_options_extra, optimized_kernel);
|
|
|
|
u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return hashconfig_esalt_size (hashconfig, user_options, user_options_extra);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
const bool optimized_kernel = (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL);
|
|
|
|
return hashconfig_tmp_size (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
u64 module_hook_salt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return hashconfig_hook_salt_size (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return hashconfig_pw_max (hashconfig, user_options, user_options_extra, optimized_kernel);
|
|
|
|
u64 module_hook_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return hashconfig_hook_size (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const char *module_benchmark_mask (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return hashconfig_benchmark_mask (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_benchmark_salt_len (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return hashconfig_benchmark_salt_len (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_salt_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return hashconfig_salt_min (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_salt_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return hashconfig_salt_max (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_pw_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return hashconfig_pw_min (hashconfig, user_options, user_options_extra);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return hashconfig_pw_max (hashconfig, user_options, user_options_extra);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, const char *line_buf, MAYBE_UNUSED const int line_len)
|
|
|
|
int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, const char *line_buf, MAYBE_UNUSED const int line_len)
|
|
|
@ -143,31 +202,3 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
|
|
|
|
|
|
|
|
|
|
|
return 32;
|
|
|
|
return 32;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void module_register (module_ctx_t *module_ctx)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
module_ctx->module_attack_exec = module_attack_exec;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_pos0 = module_dgst_pos0;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_pos1 = module_dgst_pos1;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_pos2 = module_dgst_pos2;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_pos3 = module_dgst_pos3;
|
|
|
|
|
|
|
|
module_ctx->module_dgst_size = module_dgst_size;
|
|
|
|
|
|
|
|
module_ctx->module_esalt_size = module_esalt_size;
|
|
|
|
|
|
|
|
module_ctx->module_hash_decode = module_hash_decode;
|
|
|
|
|
|
|
|
module_ctx->module_hash_encode = module_hash_encode;
|
|
|
|
|
|
|
|
module_ctx->module_hash_name = module_hash_name;
|
|
|
|
|
|
|
|
module_ctx->module_hash_type = module_hash_type;
|
|
|
|
|
|
|
|
module_ctx->module_hook_salt_size = module_hook_salt_size;
|
|
|
|
|
|
|
|
module_ctx->module_hook_size = module_hook_size;
|
|
|
|
|
|
|
|
module_ctx->module_kern_type = module_kern_type;
|
|
|
|
|
|
|
|
module_ctx->module_opti_type = module_opti_type;
|
|
|
|
|
|
|
|
module_ctx->module_opts_type = module_opts_type;
|
|
|
|
|
|
|
|
module_ctx->module_pw_max = module_pw_max;
|
|
|
|
|
|
|
|
module_ctx->module_pw_min = module_pw_min;
|
|
|
|
|
|
|
|
module_ctx->module_salt_max = module_salt_max;
|
|
|
|
|
|
|
|
module_ctx->module_salt_min = module_salt_min;
|
|
|
|
|
|
|
|
module_ctx->module_salt_type = module_salt_type;
|
|
|
|
|
|
|
|
module_ctx->module_st_hash = module_st_hash;
|
|
|
|
|
|
|
|
module_ctx->module_st_pass = module_st_pass;
|
|
|
|
|
|
|
|
module_ctx->module_tmp_size = module_tmp_size;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|