github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2024-11-20 23:27:31 +01:00
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/interface.h
View File

@ -1685,7 +1685,7 @@ const char *strparser (const u32 parser_status);
int check_old_hccap (const char *hashfile);
void to_hccapx_t (hashcat_ctx_t *hashcat_ctx, hccapx_t *hccapx, const u32 salt_pos, const u32 digest_pos);
int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_len, const u32 salt_pos, const u32 digest_pos);
int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const int out_size, const u32 salt_pos, const u32 digest_pos);
int input_tokenizer (const u8 *input_buf, const int input_len, token_t *token);
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);

4
include/modules.h
View File

@ -18,8 +18,8 @@ u32 module_pw_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MA
u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
u32 module_salt_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
u32 module_salt_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra);
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);
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_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_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);
void module_register (module_ctx_t *module_ctx);
#endif // _MODULES_H

19
include/types.h
View File

@ -2196,24 +2196,25 @@ typedef struct event_ctx
typedef struct module_ctx
{
const char *(*module_hash_name) ();
u32 (*module_salt_type) ();
u32 (*module_attack_exec) ();
u64 (*module_opts_type) ();
u32 (*module_dgst_size) ();
u32 (*module_opti_type) ();
u32 (*module_dgst_pos0) ();
u32 (*module_dgst_pos1) ();
u32 (*module_dgst_pos2) ();
u32 (*module_dgst_pos3) ();
const char *(*module_st_hash) ();
const char *(*module_st_pass) ();
u32 (*module_dgst_size) ();
u64 (*module_esalt_size) ();
int (*module_hash_decode) (const hashconfig_t *, void *, salt_t *, void *, const char *, const int);
int (*module_hash_encode) (const hashconfig_t *, const void *, const salt_t *, const void *, char *, int);
const char *(*module_hash_name) ();
u32 (*module_opti_type) ();
u64 (*module_opts_type) ();
u32 (*module_pw_min) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u32 (*module_pw_max) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u32 (*module_salt_min) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
u32 (*module_salt_max) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *);
int (*module_hash_decode) (const hashconfig_t *, void *, salt_t *, void *, const char *, const int *);
void (*module_hash_encode) (const hashconfig_t *, const void *, const salt_t *, const void *, char *, int *);
u32 (*module_salt_type) ();
const char *(*module_st_hash) ();
const char *(*module_st_pass) ();
} module_ctx_t;

53
modules/m01000.c
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;
}

36
src/hashes.c
View File

@ -920,11 +920,9 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
memset (hashes_buf[hashes_cnt].hook_salt, 0, hashconfig->hook_salt_size);
}
const int decode_sz = sizeof (hccapx_t);
hash_t *hash = &hashes_buf[hashes_cnt];
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, in, &decode_sz);
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, in, sizeof (hccapx_t));
if (parser_status != PARSER_OK)
{
@ -944,13 +942,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
if (hash_len == 32)
{
const int decode_sz = 16;
hash_t *hash;
hash = &hashes_buf[hashes_cnt];
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf + 0, &decode_sz);
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf + 0, 16);
if (parser_status == PARSER_OK)
{
@ -966,7 +962,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
hash = &hashes_buf[hashes_cnt];
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf + 16, &decode_sz);
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf + 16, 16);
if (parser_status == PARSER_OK)
{
@ -984,7 +980,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
hash_t *hash = &hashes_buf[hashes_cnt];
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf, &hash_len);
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf, hash_len);
if (parser_status == PARSER_OK)
{
@ -1024,7 +1020,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
hash_t *hash = &hashes_buf[hashes_cnt];
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf, &hash_len);
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf, hash_len);
if (parser_status == PARSER_OK)
{
@ -1154,13 +1150,11 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
if (hash_len == 32)
{
const int decode_sz = 16;
hash_t *hash;
hash = &hashes_buf[hashes_cnt];
int parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf + 0, &decode_sz);
int parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf + 0, 16);
if (parser_status < PARSER_GLOBAL_ZERO)
{
@ -1184,7 +1178,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
hash = &hashes_buf[hashes_cnt];
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf + 16, &decode_sz);
parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf + 16, 16);
if (parser_status < PARSER_GLOBAL_ZERO)
{
@ -1210,7 +1204,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
hash_t *hash = &hashes_buf[hashes_cnt];
int parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf, &hash_len);
int parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf, hash_len);
if (parser_status < PARSER_GLOBAL_ZERO)
{
@ -1237,7 +1231,7 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
{
hash_t *hash = &hashes_buf[hashes_cnt];
int parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf, &hash_len);
int parser_status = module_ctx->module_hash_decode (hashconfig, hash->digest, hash->salt, hash->esalt, hash_buf, hash_len);
if (parser_status < PARSER_GLOBAL_ZERO)
{
@ -1766,9 +1760,7 @@ int hashes_init_selftest (hashcat_ctx_t *hashcat_ctx)
tmpdata[i] = c;
}
const int decode_sz = sizeof (hccapx_t);
parser_status = module_ctx->module_hash_decode (hashconfig, hash.digest, hash.salt, hash.esalt, tmpdata, &decode_sz);
parser_status = module_ctx->module_hash_decode (hashconfig, hash.digest, hash.salt, hash.esalt, tmpdata, sizeof (hccapx_t));
hcfree (tmpdata);
@ -1798,9 +1790,7 @@ int hashes_init_selftest (hashcat_ctx_t *hashcat_ctx)
fclose (fp);
const int decode_sz = strlen (tmpfile_bin);
parser_status = module_ctx->module_hash_decode (hashconfig, hash.digest, hash.salt, hash.esalt, tmpfile_bin, &decode_sz);
parser_status = module_ctx->module_hash_decode (hashconfig, hash.digest, hash.salt, hash.esalt, tmpfile_bin, strlen (tmpfile_bin));
unlink (tmpfile_bin);
@ -1824,9 +1814,7 @@ int hashes_init_selftest (hashcat_ctx_t *hashcat_ctx)
}
}
const int decode_sz = strlen (hashconfig->st_hash);
parser_status = module_ctx->module_hash_decode (hashconfig_st, hash.digest, hash.salt, hash.esalt, hashconfig->st_hash, &decode_sz);
parser_status = module_ctx->module_hash_decode (hashconfig_st, hash.digest, hash.salt, hash.esalt, hashconfig->st_hash, strlen (hashconfig->st_hash));
hcfree (hashconfig_st);
}

418
src/interface.c
View File

File diff suppressed because it is too large Load Diff

4
src/outfile_check.c
View File

@ -227,9 +227,7 @@ static int outfile_remove (hashcat_ctx_t *hashcat_ctx)
}
else // "normal" case: hash in the outfile is the same as the hash in the original hash file
{
const int decode_sz = line_len - 1;
parser_status = module_ctx->module_hash_decode (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, line_buf, &decode_sz);
parser_status = module_ctx->module_hash_decode (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, line_buf, line_len - 1);
}
if (parser_status != PARSER_OK) continue;

6
src/potfile.c
View File

@ -506,9 +506,7 @@ int potfile_remove_parse (hashcat_ctx_t *hashcat_ctx)
if (hashconfig->hash_mode == 3000)
{
const int decode_sz = 16;
const int parser_status = module_ctx->module_hash_decode (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, LM_ZERO_HASH, &decode_sz);
const int parser_status = module_ctx->module_hash_decode (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, LM_ZERO_HASH, 16);
if (parser_status == PARSER_OK)
{
@ -642,7 +640,7 @@ int potfile_remove_parse (hashcat_ctx_t *hashcat_ctx)
}
else
{
const int parser_status = module_ctx->module_hash_decode (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, line_hash_buf, &line_hash_len);
const int parser_status = module_ctx->module_hash_decode (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, line_hash_buf, line_hash_len);
if (parser_status != PARSER_OK) continue;