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 hwmon_disable variable to just hwmon, same idea as outfile_autohex variable

Browse Source
This commit is contained in:
jsteube 2023-10-15 18:40:56 +00:00
parent 7bd7f2d8a1
commit 98ee1bd396
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/types.h
View File

@ -639,7 +639,7 @@ typedef enum user_options_defaults
DEBUG_MODE = 0, DEBUG_MODE = 0,
DEPRECATED_CHECK = true, DEPRECATED_CHECK = true,
FORCE = false, FORCE = false,
HWMON_DISABLE = false, HWMON = true,
#if defined (__APPLE__) #if defined (__APPLE__)
HWMON_TEMP_ABORT = 100, HWMON_TEMP_ABORT = 100,
#else #else
@ -2332,7 +2332,7 @@ typedef struct user_options
#endif #endif
bool force; bool force;
bool deprecated_check; bool deprecated_check;
bool hwmon_disable; bool hwmon;
bool hash_info; bool hash_info;
bool hex_charset; bool hex_charset;
bool hex_salt; bool hex_salt;

14
src/user_options.c
View File

@ -208,7 +208,7 @@ int user_options_init (hashcat_ctx_t *hashcat_ctx)
user_options->encoding_from = ENCODING_FROM; user_options->encoding_from = ENCODING_FROM;
user_options->encoding_to = ENCODING_TO; user_options->encoding_to = ENCODING_TO;
user_options->force = FORCE; user_options->force = FORCE;
user_options->hwmon_disable = HWMON_DISABLE; user_options->hwmon = HWMON;
user_options->hwmon_temp_abort = HWMON_TEMP_ABORT; user_options->hwmon_temp_abort = HWMON_TEMP_ABORT;
user_options->hash_info = HASH_INFO; user_options->hash_info = HASH_INFO;
user_options->hash_mode = HASH_MODE; user_options->hash_mode = HASH_MODE;
@ -497,7 +497,7 @@ int user_options_getopt (hashcat_ctx_t *hashcat_ctx, int argc, char **argv)
user_options->kernel_threads_chgd = true; break; user_options->kernel_threads_chgd = true; break;
case IDX_SPIN_DAMP: user_options->spin_damp = hc_strtoul (optarg, NULL, 10); case IDX_SPIN_DAMP: user_options->spin_damp = hc_strtoul (optarg, NULL, 10);
user_options->spin_damp_chgd = true; break; user_options->spin_damp_chgd = true; break;
case IDX_HWMON_DISABLE: user_options->hwmon_disable = true; break; case IDX_HWMON_DISABLE: user_options->hwmon = false; break;
case IDX_HWMON_TEMP_ABORT: user_options->hwmon_temp_abort = hc_strtoul (optarg, NULL, 10); break; case IDX_HWMON_TEMP_ABORT: user_options->hwmon_temp_abort = hc_strtoul (optarg, NULL, 10); break;
case IDX_LOGFILE_DISABLE: user_options->logfile_disable = true; break; case IDX_LOGFILE_DISABLE: user_options->logfile_disable = true; break;
case IDX_HCCAPX_MESSAGE_PAIR: user_options->hccapx_message_pair = hc_strtoul (optarg, NULL, 10); case IDX_HCCAPX_MESSAGE_PAIR: user_options->hccapx_message_pair = hc_strtoul (optarg, NULL, 10);
@ -1832,7 +1832,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
if (user_options->stdout_flag) if (user_options->stdout_flag)
{ {
user_options->hwmon_disable = true; user_options->hwmon = false;
user_options->left = false; user_options->left = false;
user_options->logfile_disable = true; user_options->logfile_disable = true;
user_options->spin_damp = 0; user_options->spin_damp = 0;
@ -1856,7 +1856,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
|| user_options->usage > 0 || user_options->usage > 0
|| user_options->backend_info > 0) || user_options->backend_info > 0)
{ {
user_options->hwmon_disable = true; user_options->hwmon = false;
user_options->left = false; user_options->left = false;
user_options->logfile_disable = true; user_options->logfile_disable = true;
user_options->spin_damp = 0; user_options->spin_damp = 0;
@ -2007,10 +2007,10 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
} }
#if !defined (WITH_HWMON) #if !defined (WITH_HWMON)
user_options->hwmon_disable = true; user_options->hwmon = false;
#endif // WITH_HWMON #endif // WITH_HWMON
if (user_options->hwmon_disable == true) if (user_options->hwmon == false)
{ {
user_options->hwmon_temp_abort = 0; user_options->hwmon_temp_abort = 0;
} }
@ -3230,7 +3230,7 @@ void user_options_logger (hashcat_ctx_t *hashcat_ctx)
logfile_top_uint (user_options->debug_mode); logfile_top_uint (user_options->debug_mode);
logfile_top_uint (user_options->hash_info); logfile_top_uint (user_options->hash_info);
logfile_top_uint (user_options->force); logfile_top_uint (user_options->force);
logfile_top_uint (user_options->hwmon_disable); logfile_top_uint (user_options->hwmon);
logfile_top_uint (user_options->hwmon_temp_abort); logfile_top_uint (user_options->hwmon_temp_abort);
logfile_top_uint (user_options->hash_mode); logfile_top_uint (user_options->hash_mode);
logfile_top_uint (user_options->hex_charset); logfile_top_uint (user_options->hex_charset);