arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-26 01:42:36 +00:00
Code Issues Releases Wiki Activity

Get rid of install_dir, profile_dir, shared_dir, and session_dir variables from data. context

Browse Source
This commit is contained in:
jsteube 2016-09-22 14:38:02 +02:00
parent a628cd399a
commit 2476f36ffe
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/types.h
View File

@ -893,8 +893,6 @@ typedef struct
* threads * threads
*/ */
opencl_ctx_t *opencl_ctx;
u32 shutdown_inner; u32 shutdown_inner;
u32 shutdown_outer; u32 shutdown_outer;
@ -910,14 +908,7 @@ typedef struct
* attack specific * attack specific
*/ */
u32 wordlist_mode; u32 kernel_rules_cnt;
u32 attack_mode;
u32 attack_kern;
u32 kernel_rules_cnt;
kernel_rule_t *kernel_rules_buf; kernel_rule_t *kernel_rules_buf;
u32 combs_mode; u32 combs_mode;
@ -963,25 +954,23 @@ typedef struct
* user * user
*/ */
u32 wordlist_mode;
u32 attack_mode;
u32 attack_kern;
char *dictfile; char *dictfile;
char *dictfile2; char *dictfile2;
char *mask; char *mask;
u32 maskcnt; u32 maskcnt;
u32 maskpos; u32 maskpos;
char *session; char *session;
char *install_dir;
char *profile_dir;
char *session_dir;
char *shared_dir;
u32 outfile_check_timer; u32 outfile_check_timer;
char *eff_restore_file; char *eff_restore_file;
char *new_restore_file; char *new_restore_file;
char *induction_directory; char *induction_directory;
char *outfile_check_directory; char *outfile_check_directory;
u32 loopback; u32 loopback;
u32 restore; u32 restore;
u32 restore_timer; u32 restore_timer;
u32 restore_disable; u32 restore_disable;
@ -994,7 +983,6 @@ typedef struct
u32 runtime; u32 runtime;
u32 remove; u32 remove;
u32 remove_timer; u32 remove_timer;
u32 hex_charset; u32 hex_charset;
u32 hex_salt; u32 hex_salt;
u32 hex_wordlist; u32 hex_wordlist;
@ -1007,6 +995,7 @@ typedef struct
char *veracrypt_keyfiles; char *veracrypt_keyfiles;
u32 veracrypt_pim; u32 veracrypt_pim;
opencl_ctx_t *opencl_ctx;
hashconfig_t *hashconfig; hashconfig_t *hashconfig;
hashes_t *hashes; hashes_t *hashes;
user_options_t *user_options; user_options_t *user_options;

9
src/hashcat.c
View File

@ -191,11 +191,6 @@ int main (int argc, char **argv)
folder_config_init (folder_config, install_folder, shared_folder); folder_config_init (folder_config, install_folder, shared_folder);
data.install_dir = folder_config->install_dir;
data.profile_dir = folder_config->profile_dir;
data.session_dir = folder_config->session_dir;
data.shared_dir = folder_config->shared_dir;
/** /**
* commandline parameters * commandline parameters
*/ */
@ -220,8 +215,8 @@ int main (int argc, char **argv)
char *eff_restore_file = (char *) mymalloc (HCBUFSIZ_TINY); char *eff_restore_file = (char *) mymalloc (HCBUFSIZ_TINY);
char *new_restore_file = (char *) mymalloc (HCBUFSIZ_TINY); char *new_restore_file = (char *) mymalloc (HCBUFSIZ_TINY);
snprintf (eff_restore_file, HCBUFSIZ_TINY - 1, "%s/%s.restore", data.session_dir, user_options->session); snprintf (eff_restore_file, HCBUFSIZ_TINY - 1, "%s/%s.restore", folder_config->session_dir, user_options->session);
snprintf (new_restore_file, HCBUFSIZ_TINY - 1, "%s/%s.restore.new", data.session_dir, user_options->session); snprintf (new_restore_file, HCBUFSIZ_TINY - 1, "%s/%s.restore.new", folder_config->session_dir, user_options->session);
data.eff_restore_file = eff_restore_file; data.eff_restore_file = eff_restore_file;
data.new_restore_file = new_restore_file; data.new_restore_file = new_restore_file;