DeforaNetworks/hashcat
3
0
Fork 0
Code Releases Activity

Call module_hash_encode() in ascii_digest()

Browse Source
This commit is contained in:
Jens Steube
2018-12-14 15:29:57 +01:00
parent 222d76f01e
commit 3aecd150f9
8 changed files with 278 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/m01000.c
+31 -22
View File
@@ -5,10 +5,11 @@
#include "common.h"
#include "types.h"
#include "modules.h"
#include "bitops.h"
#include "convert.h"
#include "interface.h"
#include "inc_hash_constants.h"
#include "modules.h"
static const char *HASH_NAME = "NTLM";
static const u32 SALT_TYPE = SALT_TYPE_NONE;
@@ -18,6 +19,7 @@ static const u32 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE
| OPTS_TYPE_PT_ADDBITS14
| OPTS_TYPE_PT_UTF16LE;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u64 ESALT_SIZE = 0;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_PRECOMPUTE_INIT
| OPTI_TYPE_PRECOMPUTE_MERKLE
@@ -33,16 +35,17 @@ static const u32 DGST_POS3 = 1;
static const char *ST_HASH = "b4b9b02e6f09a9bd760f388b67351e2b";
static const char *ST_PASS = "hashcat";
const char *module_hash_name () { return HASH_NAME; }
u32 module_salt_type () { return SALT_TYPE; }
u32 module_attack_exec () { return ATTACK_EXEC; }
u64 module_opts_type () { return OPTS_TYPE; }
u32 module_dgst_size () { return DGST_SIZE; }
u32 module_opti_type () { return OPTI_TYPE; }
u32 module_dgst_pos0 () { return DGST_POS0; }
u32 module_dgst_pos1 () { return DGST_POS1; }
u32 module_dgst_pos2 () { return DGST_POS2; }
u32 module_dgst_pos3 () { return DGST_POS3; }
u32 module_dgst_size () { return DGST_SIZE; }
u64 module_esalt_size () { return ESALT_SIZE; }
const char *module_hash_name () { return HASH_NAME; }
u32 module_opti_type () { return OPTI_TYPE; }
u64 module_opts_type () { return OPTS_TYPE; }
u32 module_salt_type () { return SALT_TYPE; }
const char *module_st_hash () { return ST_HASH; }
const char *module_st_pass () { return ST_PASS; }
@@ -74,7 +77,7 @@ u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED con
return hashconfig_pw_max (hashconfig, user_options, user_options_extra, optimized_kernel);
}
int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, const char *line_buf, const int *line_len)
int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, const char *line_buf, const int line_len)
{
u32 *digest = (u32 *) digest_buf;
@@ -87,7 +90,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX;
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, (const int) *line_len, &token);
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
@@ -109,7 +112,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
return (PARSER_OK);
}
void module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, char *line_buf, int *line_len)
int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, char *line_buf, const int line_size)
{
const u32 *digest = (const u32 *) digest_buf;
@@ -131,33 +134,39 @@ void module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUS
tmp[3] += MD4M_D;
}
const int out_len = snprintf (line_buf, HCBUFSIZ_LARGE, "%08x%08x%08x%08x",
tmp[0] = byte_swap_32 (tmp[0]);
tmp[1] = byte_swap_32 (tmp[1]);
tmp[2] = byte_swap_32 (tmp[2]);
tmp[3] = byte_swap_32 (tmp[3]);
const int out_len = snprintf (line_buf, line_size, "%08x%08x%08x%08x",
tmp[0],
tmp[1],
tmp[2],
tmp[3]);
*line_len = out_len;
return out_len;
}
void module_register (module_ctx_t *module_ctx)
{
module_ctx->module_hash_name = module_hash_name;
module_ctx->module_salt_type = module_salt_type;
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_opts_type = module_opts_type;
module_ctx->module_dgst_size = module_dgst_size;
module_ctx->module_opti_type = module_opti_type;
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_st_hash = module_st_hash;
module_ctx->module_st_pass = module_st_pass;
module_ctx->module_salt_min = module_salt_min;
module_ctx->module_salt_max = module_salt_max;
module_ctx->module_pw_min = module_pw_min;
module_ctx->module_pw_max = module_pw_max;
module_ctx->module_dgst_size = module_dgst_size;
module_ctx->module_esalt_size = module_esalt_size;
module_ctx->module_hash_decode = module_hash_decode;
module_ctx->module_hash_encode = module_hash_encode;
module_ctx->module_hash_name = module_hash_name;
module_ctx->module_opti_type = module_opti_type;
module_ctx->module_opts_type = module_opts_type;
module_ctx->module_pw_max = module_pw_max;
module_ctx->module_pw_min = module_pw_min;
module_ctx->module_salt_max = module_salt_max;
module_ctx->module_salt_min = module_salt_min;
module_ctx->module_salt_type = module_salt_type;
module_ctx->module_st_hash = module_st_hash;
module_ctx->module_st_pass = module_st_pass;
}