arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 08:08:10 +00:00
Code Issues Releases Wiki Activity

Refactor potfile_disable variable to just putfile, same idea as outfile_autohex variable

Browse Source
This commit is contained in:
jsteube 2023-10-21 16:42:29 +00:00
parent b597a96328
commit e55b331058
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/types.h
View File

@ -686,7 +686,7 @@ typedef enum user_options_defaults
OUTFILE_CHECK_TIMER = 5, OUTFILE_CHECK_TIMER = 5,
OUTFILE_FORMAT = 3, OUTFILE_FORMAT = 3,
OUTFILE_JSON = false, OUTFILE_JSON = false,
POTFILE_DISABLE = false, POTFILE = true,
PROGRESS_ONLY = false, PROGRESS_ONLY = false,
QUIET = false, QUIET = false,
REMOVE = false, REMOVE = false,
@ -2355,7 +2355,7 @@ typedef struct user_options
bool multiply_accel; bool multiply_accel;
bool outfile_autohex; bool outfile_autohex;
bool outfile_json; bool outfile_json;
bool potfile_disable; bool potfile;
bool progress_only; bool progress_only;
bool quiet; bool quiet;
bool remove; bool remove;

2
src/hashcat.c
View File

@ -615,7 +615,7 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
* potfile removes * potfile removes
*/ */
if (user_options->potfile_disable == false) if (user_options->potfile == true)
{ {
EVENT (EVENT_POTFILE_REMOVE_PARSE_PRE); EVENT (EVENT_POTFILE_REMOVE_PARSE_PRE);

24
src/potfile.c
View File

@ -110,20 +110,20 @@ int potfile_init (hashcat_ctx_t *hashcat_ctx)
potfile_ctx->enabled = false; potfile_ctx->enabled = false;
if (user_options->usage > 0) return 0; if (user_options->usage > 0) return 0;
if (user_options->backend_info > 0) return 0; if (user_options->backend_info > 0) return 0;
if (user_options->benchmark == true) return 0; if (user_options->benchmark == true) return 0;
if (user_options->hash_info == true) return 0; if (user_options->hash_info == true) return 0;
if (user_options->keyspace == true) return 0; if (user_options->keyspace == true) return 0;
if (user_options->stdout_flag == true) return 0; if (user_options->stdout_flag == true) return 0;
if (user_options->speed_only == true) return 0; if (user_options->speed_only == true) return 0;
if (user_options->progress_only == true) return 0; if (user_options->progress_only == true) return 0;
if (user_options->version == true) return 0; if (user_options->version == true) return 0;
if (user_options->identify == true) return 0; if (user_options->identify == true) return 0;
if (user_options->potfile_disable == true) return 0; if (user_options->potfile == false) return 0;
if (hashconfig->potfile_disable == true) return 0; if (hashconfig->potfile_disable == true) return 0;
potfile_ctx->enabled = true; potfile_ctx->enabled = true;

18
src/user_options.c
View File

@ -249,7 +249,7 @@ int user_options_init (hashcat_ctx_t *hashcat_ctx)
user_options->outfile_format = OUTFILE_FORMAT; user_options->outfile_format = OUTFILE_FORMAT;
user_options->outfile_json = OUTFILE_JSON; user_options->outfile_json = OUTFILE_JSON;
user_options->outfile = NULL; user_options->outfile = NULL;
user_options->potfile_disable = POTFILE_DISABLE; user_options->potfile = POTFILE;
user_options->potfile_path = NULL; user_options->potfile_path = NULL;
user_options->progress_only = PROGRESS_ONLY; user_options->progress_only = PROGRESS_ONLY;
user_options->quiet = QUIET; user_options->quiet = QUIET;
@ -404,7 +404,7 @@ int user_options_getopt (hashcat_ctx_t *hashcat_ctx, int argc, char **argv)
case IDX_REMOVE: user_options->remove = true; break; case IDX_REMOVE: user_options->remove = true; break;
case IDX_REMOVE_TIMER: user_options->remove_timer = hc_strtoul (optarg, NULL, 10); case IDX_REMOVE_TIMER: user_options->remove_timer = hc_strtoul (optarg, NULL, 10);
user_options->remove_timer_chgd = true; break; user_options->remove_timer_chgd = true; break;
case IDX_POTFILE_DISABLE: user_options->potfile_disable = true; break; case IDX_POTFILE_DISABLE: user_options->potfile = false; break;
case IDX_POTFILE_PATH: user_options->potfile_path = optarg; break; case IDX_POTFILE_PATH: user_options->potfile_path = optarg; break;
case IDX_DEBUG_MODE: user_options->debug_mode = hc_strtoul (optarg, NULL, 10); break; case IDX_DEBUG_MODE: user_options->debug_mode = hc_strtoul (optarg, NULL, 10); break;
case IDX_DEBUG_FILE: user_options->debug_file = optarg; break; case IDX_DEBUG_FILE: user_options->debug_file = optarg; break;
@ -1065,7 +1065,7 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
return -1; return -1;
} }
if (user_options->potfile_disable == true) if (user_options->potfile == false)
{ {
event_log_error (hashcat_ctx, "Mixing --potfile-disable is not allowed with --show or --left."); event_log_error (hashcat_ctx, "Mixing --potfile-disable is not allowed with --show or --left.");
@ -1481,7 +1481,7 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
return -1; return -1;
} }
if ((user_options->brain_client == true) && (user_options->potfile_disable == true)) if ((user_options->brain_client == true) && (user_options->potfile == false))
{ {
event_log_error (hashcat_ctx, "Using --potfile-disable is not allowed if --brain-client is used."); event_log_error (hashcat_ctx, "Using --potfile-disable is not allowed if --brain-client is used.");
@ -1837,7 +1837,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
user_options->logfile = false; user_options->logfile = false;
user_options->spin_damp = 0; user_options->spin_damp = 0;
user_options->outfile_check_timer = 0; user_options->outfile_check_timer = 0;
user_options->potfile_disable = true; user_options->potfile = false;
user_options->restore_enable = false; user_options->restore_enable = false;
user_options->restore = false; user_options->restore = false;
user_options->restore_timer = 0; user_options->restore_timer = 0;
@ -1861,7 +1861,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
user_options->logfile = false; user_options->logfile = false;
user_options->spin_damp = 0; user_options->spin_damp = 0;
user_options->outfile_check_timer = 0; user_options->outfile_check_timer = 0;
user_options->potfile_disable = true; user_options->potfile = false;
user_options->restore_enable = false; user_options->restore_enable = false;
user_options->restore = false; user_options->restore = false;
user_options->restore_timer = 0; user_options->restore_timer = 0;
@ -1883,7 +1883,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
user_options->left = false; user_options->left = false;
user_options->logfile = false; user_options->logfile = false;
user_options->spin_damp = 0; user_options->spin_damp = 0;
user_options->potfile_disable = true; user_options->potfile = false;
user_options->progress_only = false; user_options->progress_only = false;
user_options->restore_enable = false; user_options->restore_enable = false;
user_options->restore = false; user_options->restore = false;
@ -2070,7 +2070,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
if (user_options->attack_mode == ATTACK_MODE_ASSOCIATION) if (user_options->attack_mode == ATTACK_MODE_ASSOCIATION)
{ {
user_options->potfile_disable = true; user_options->potfile = false;
} }
if (user_options->stdout_flag == false && user_options->benchmark == false && user_options->keyspace == false) if (user_options->stdout_flag == false && user_options->benchmark == false && user_options->keyspace == false)
@ -3264,7 +3264,7 @@ void user_options_logger (hashcat_ctx_t *hashcat_ctx)
logfile_top_uint (user_options->outfile_format); logfile_top_uint (user_options->outfile_format);
logfile_top_uint (user_options->outfile_json); logfile_top_uint (user_options->outfile_json);
logfile_top_uint (user_options->wordlist_autohex); logfile_top_uint (user_options->wordlist_autohex);
logfile_top_uint (user_options->potfile_disable); logfile_top_uint (user_options->potfile);
logfile_top_uint (user_options->progress_only); logfile_top_uint (user_options->progress_only);
logfile_top_uint (user_options->quiet); logfile_top_uint (user_options->quiet);
logfile_top_uint (user_options->remove); logfile_top_uint (user_options->remove);