Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
/**
|
|
|
|
* Author......: See docs/credits.txt
|
|
|
|
* License.....: MIT
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "common.h"
|
|
|
|
#include "types.h"
|
|
|
|
#include "modules.h"
|
|
|
|
#include "bitops.h"
|
|
|
|
#include "convert.h"
|
|
|
|
#include "shared.h"
|
|
|
|
|
|
|
|
static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL;
|
|
|
|
static const u32 DGST_POS0 = 0;
|
|
|
|
static const u32 DGST_POS1 = 3;
|
|
|
|
static const u32 DGST_POS2 = 2;
|
|
|
|
static const u32 DGST_POS3 = 1;
|
|
|
|
static const u32 DGST_SIZE = DGST_SIZE_4_4;
|
|
|
|
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_SALTED;
|
|
|
|
static const char *HASH_NAME = "md5($salt.$pass.$salt)";
|
|
|
|
static const u64 KERN_TYPE = 3800;
|
|
|
|
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
|
|
|
| OPTI_TYPE_PRECOMPUTE_INIT
|
|
|
|
| OPTI_TYPE_EARLY_SKIP
|
|
|
|
| OPTI_TYPE_NOT_ITERATED
|
|
|
|
| OPTI_TYPE_RAW_HASH;
|
2019-02-12 15:02:27 +00:00
|
|
|
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE
|
Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
| OPTS_TYPE_ST_ADDBITS14;
|
|
|
|
static const u32 SALT_TYPE = SALT_TYPE_GENERIC;
|
|
|
|
static const char *ST_PASS = "hashcat";
|
|
|
|
static const char *ST_HASH = "78274b1105fb8a7c415b43ffe35ec4a9:6";
|
|
|
|
|
|
|
|
u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ATTACK_EXEC; }
|
|
|
|
u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS0; }
|
|
|
|
u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS1; }
|
|
|
|
u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS2; }
|
|
|
|
u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS3; }
|
|
|
|
u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_SIZE; }
|
|
|
|
u32 module_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) { return HASH_CATEGORY; }
|
|
|
|
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; }
|
|
|
|
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, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len)
|
|
|
|
{
|
|
|
|
u32 *digest = (u32 *) digest_buf;
|
|
|
|
|
|
|
|
token_t token;
|
|
|
|
|
|
|
|
token.token_cnt = 2;
|
|
|
|
|
|
|
|
token.sep[0] = hashconfig->separator;
|
|
|
|
token.len_min[0] = 32;
|
|
|
|
token.len_max[0] = 32;
|
|
|
|
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
|
|
|
|
| TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
|
|
|
|
token.len_min[1] = SALT_MIN;
|
|
|
|
token.len_max[1] = SALT_MAX;
|
|
|
|
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH;
|
|
|
|
|
|
|
|
if (hashconfig->opts_type & OPTS_TYPE_ST_HEX)
|
|
|
|
{
|
|
|
|
token.len_min[1] *= 2;
|
|
|
|
token.len_max[1] *= 2;
|
|
|
|
|
|
|
|
token.attr[1] |= TOKEN_ATTR_VERIFY_HEX;
|
|
|
|
}
|
|
|
|
|
|
|
|
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
|
|
|
|
|
|
|
|
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
|
|
|
|
|
|
|
|
const u8 *hash_pos = token.buf[0];
|
|
|
|
|
|
|
|
digest[0] = hex_to_u32 (hash_pos + 0);
|
|
|
|
digest[1] = hex_to_u32 (hash_pos + 8);
|
|
|
|
digest[2] = hex_to_u32 (hash_pos + 16);
|
|
|
|
digest[3] = hex_to_u32 (hash_pos + 24);
|
|
|
|
|
2019-02-12 15:02:27 +00:00
|
|
|
if (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL)
|
Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
{
|
|
|
|
digest[0] -= MD5M_A;
|
|
|
|
digest[1] -= MD5M_B;
|
|
|
|
digest[2] -= MD5M_C;
|
|
|
|
digest[3] -= MD5M_D;
|
|
|
|
}
|
|
|
|
|
|
|
|
const u8 *salt_pos = token.buf[1];
|
|
|
|
const int salt_len = token.len[1];
|
|
|
|
|
2019-02-14 08:53:29 +00:00
|
|
|
const bool parse_rc = generic_salt_decode (hashconfig, salt_pos, salt_len, (u8 *) salt->salt_buf, (int *) &salt->salt_len);
|
Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
|
|
|
|
if (parse_rc == false) return (PARSER_SALT_LENGTH);
|
|
|
|
|
|
|
|
return (PARSER_OK);
|
|
|
|
}
|
|
|
|
|
|
|
|
int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size)
|
|
|
|
{
|
|
|
|
const u32 *digest = (const u32 *) digest_buf;
|
|
|
|
|
|
|
|
// we can not change anything in the original buffer, otherwise destroying sorting
|
|
|
|
// therefore create some local buffer
|
|
|
|
|
|
|
|
u32 tmp[4];
|
|
|
|
|
|
|
|
tmp[0] = digest[0];
|
|
|
|
tmp[1] = digest[1];
|
|
|
|
tmp[2] = digest[2];
|
|
|
|
tmp[3] = digest[3];
|
|
|
|
|
2019-02-12 15:02:27 +00:00
|
|
|
if (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL)
|
Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
{
|
|
|
|
tmp[0] += MD5M_A;
|
|
|
|
tmp[1] += MD5M_B;
|
|
|
|
tmp[2] += MD5M_C;
|
|
|
|
tmp[3] += MD5M_D;
|
|
|
|
}
|
|
|
|
|
|
|
|
u8 *out_buf = (u8 *) line_buf;
|
|
|
|
|
|
|
|
int out_len = 0;
|
|
|
|
|
|
|
|
u32_to_hex (tmp[0], out_buf + out_len); out_len += 8;
|
|
|
|
u32_to_hex (tmp[1], out_buf + out_len); out_len += 8;
|
|
|
|
u32_to_hex (tmp[2], out_buf + out_len); out_len += 8;
|
|
|
|
u32_to_hex (tmp[3], out_buf + out_len); out_len += 8;
|
|
|
|
|
|
|
|
out_buf[out_len] = hashconfig->separator;
|
|
|
|
|
|
|
|
out_len += 1;
|
|
|
|
|
2019-02-14 12:05:14 +00:00
|
|
|
out_len += generic_salt_encode (hashconfig, (const u8 *) salt->salt_buf, (const int) salt->salt_len, out_buf + out_len);
|
Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
|
|
|
|
return out_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
module_ctx->module_benchmark_mask = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_benchmark_salt = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_build_plain_postprocess = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_deep_comp_kernel = MODULE_DEFAULT;
|
|
|
|
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_dictstat_disable = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_esalt_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_extra_buffer_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_extra_tmp_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_forced_outfile_format = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hash_binary_count = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hash_binary_parse = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hash_binary_save = MODULE_DEFAULT;
|
2019-04-01 10:32:11 +00:00
|
|
|
module_ctx->module_hash_decode_potfile = MODULE_DEFAULT;
|
Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hash_decode = module_hash_decode;
|
|
|
|
module_ctx->module_hash_encode_status = MODULE_DEFAULT;
|
2019-04-01 10:32:11 +00:00
|
|
|
module_ctx->module_hash_encode_potfile = MODULE_DEFAULT;
|
Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
module_ctx->module_hash_encode = module_hash_encode;
|
|
|
|
module_ctx->module_hash_init_selftest = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hash_mode = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hash_category = module_hash_category;
|
|
|
|
module_ctx->module_hash_name = module_hash_name;
|
|
|
|
module_ctx->module_hlfmt_disable = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hook12 = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hook23 = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_hook_size = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_jit_build_options = MODULE_DEFAULT;
|
2019-03-02 10:12:13 +00:00
|
|
|
module_ctx->module_jit_cache_disable = MODULE_DEFAULT;
|
Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_loops_max = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_loops_min = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_threads_max = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kernel_threads_min = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_kern_type = module_kern_type;
|
|
|
|
module_ctx->module_kern_type_dynamic = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_opti_type = module_opti_type;
|
|
|
|
module_ctx->module_opts_type = module_opts_type;
|
|
|
|
module_ctx->module_outfile_check_disable = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
|
2019-04-02 09:24:22 +00:00
|
|
|
module_ctx->module_potfile_custom_check = MODULE_DEFAULT;
|
Add -m 3710, 3800, 4010, 4110, 4300, 4400, 4500, 4520, 4521, 4522, 4700 module
2019-02-12 12:17:58 +00:00
|
|
|
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_salt_type;
|
|
|
|
module_ctx->module_separator = MODULE_DEFAULT;
|
|
|
|
module_ctx->module_st_hash = module_st_hash;
|
|
|
|
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;
|
|
|
|
}
|