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
include/interface.h
+1 -1
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);
include/modules.h
+2 -2
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
include/types.h
+10 -9
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;