arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-29 19:38:18 +00:00
Code Issues Releases Wiki Activity

Get rid of hex_wordlist variable in data. context

Browse Source
This commit is contained in:
jsteube 2016-09-22 15:14:55 +02:00
parent 6b5d8ed62c
commit 5b0835258c
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types.h
View File

@ -973,7 +973,6 @@ typedef struct
u32 force; u32 force;
u32 hex_charset; u32 hex_charset;
u32 hex_salt; u32 hex_salt;
u32 hex_wordlist;
u32 pw_min; u32 pw_min;
u32 pw_max; u32 pw_max;

2
include/wordlist.h
View File

@ -6,7 +6,7 @@
#ifndef _WORDLIST_H #ifndef _WORDLIST_H
#define _WORDLIST_H #define _WORDLIST_H
uint convert_from_hex (char *line_buf, const uint line_len); uint convert_from_hex (char *line_buf, const uint line_len, const user_options_t *user_options);
void load_segment (wl_data_t *wl_data, FILE *fd); void load_segment (wl_data_t *wl_data, FILE *fd);

4
src/dispatch.c
View File

@ -146,7 +146,7 @@ void *thread_calc_stdin (void *p)
uint line_len = in_superchop (line_buf); uint line_len = in_superchop (line_buf);
line_len = convert_from_hex (line_buf, line_len); line_len = convert_from_hex (line_buf, line_len, user_options);
// post-process rule engine // post-process rule engine
@ -381,7 +381,7 @@ void *thread_calc (void *p)
{ {
get_next_word (wl_data, user_options, user_options_extra, fd, &line_buf, &line_len); get_next_word (wl_data, user_options, user_options_extra, fd, &line_buf, &line_len);
line_len = convert_from_hex (line_buf, line_len); line_len = convert_from_hex (line_buf, line_len, user_options);
// post-process rule engine // post-process rule engine

1
src/hashcat.c
View File

@ -274,7 +274,6 @@ int main (int argc, char **argv)
data.force = user_options->force; data.force = user_options->force;
data.hex_charset = user_options->hex_charset; data.hex_charset = user_options->hex_charset;
data.hex_salt = user_options->hex_salt; data.hex_salt = user_options->hex_salt;
data.hex_wordlist = user_options->hex_wordlist;
data.logfile_disable = user_options->logfile_disable; data.logfile_disable = user_options->logfile_disable;
data.quiet = user_options->quiet; data.quiet = user_options->quiet;

2
src/opencl.c
View File

@ -1077,7 +1077,7 @@ int run_cracker (opencl_ctx_t *opencl_ctx, hc_device_param_t *device_param, hash
if (line_len >= PW_MAX1) continue; if (line_len >= PW_MAX1) continue;
line_len = convert_from_hex (line_buf, line_len); line_len = convert_from_hex (line_buf, line_len, user_options);
char *line_buf_new = line_buf; char *line_buf_new = line_buf;

4
src/wordlist.c
View File

@ -37,11 +37,11 @@
extern hc_global_data_t data; extern hc_global_data_t data;
uint convert_from_hex (char *line_buf, const uint line_len) uint convert_from_hex (char *line_buf, const uint line_len, const user_options_t *user_options)
{ {
if (line_len & 1) return (line_len); // not in hex if (line_len & 1) return (line_len); // not in hex
if (data.hex_wordlist == 1) if (user_options->hex_wordlist == true)
{ {
uint i; uint i;
uint j; uint j;