From e933d1283837a6cf7b64aeb6e00ed69c5afbf46b Mon Sep 17 00:00:00 2001 From: jsteube Date: Fri, 24 Mar 2017 23:39:09 +0100 Subject: [PATCH] Rename Input.Mode, Input.Base, ... to Guess.Mode, Guess.Base, ... --- include/status.h | 24 ++--- include/types.h | 62 ++++++------- src/hashcat.c | 24 ++--- src/status.c | 70 +++++++------- src/terminal.c | 232 +++++++++++++++++++++++------------------------ 5 files changed, 206 insertions(+), 206 deletions(-) diff --git a/include/status.h b/include/status.h index d893cf9a9..d9ac751b7 100644 --- a/include/status.h +++ b/include/status.h @@ -22,18 +22,18 @@ bool status_get_skipped_dev (const hashcat_ctx_t *hashcat_ctx, char *status_get_session (const hashcat_ctx_t *hashcat_ctx); char *status_get_status_string (const hashcat_ctx_t *hashcat_ctx); int status_get_status_number (const hashcat_ctx_t *hashcat_ctx); -int status_get_input_mode (const hashcat_ctx_t *hashcat_ctx); -char *status_get_input_base (const hashcat_ctx_t *hashcat_ctx); -int status_get_input_base_offset (const hashcat_ctx_t *hashcat_ctx); -int status_get_input_base_count (const hashcat_ctx_t *hashcat_ctx); -double status_get_input_base_percent (const hashcat_ctx_t *hashcat_ctx); -char *status_get_input_mod (const hashcat_ctx_t *hashcat_ctx); -int status_get_input_mod_offset (const hashcat_ctx_t *hashcat_ctx); -int status_get_input_mod_count (const hashcat_ctx_t *hashcat_ctx); -double status_get_input_mod_percent (const hashcat_ctx_t *hashcat_ctx); -char *status_get_input_charset (const hashcat_ctx_t *hashcat_ctx); -int status_get_input_mask_length (const hashcat_ctx_t *hashcat_ctx); -char *status_get_input_candidates_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id); +int status_get_guess_mode (const hashcat_ctx_t *hashcat_ctx); +char *status_get_guess_base (const hashcat_ctx_t *hashcat_ctx); +int status_get_guess_base_offset (const hashcat_ctx_t *hashcat_ctx); +int status_get_guess_base_count (const hashcat_ctx_t *hashcat_ctx); +double status_get_guess_base_percent (const hashcat_ctx_t *hashcat_ctx); +char *status_get_guess_mod (const hashcat_ctx_t *hashcat_ctx); +int status_get_guess_mod_offset (const hashcat_ctx_t *hashcat_ctx); +int status_get_guess_mod_count (const hashcat_ctx_t *hashcat_ctx); +double status_get_guess_mod_percent (const hashcat_ctx_t *hashcat_ctx); +char *status_get_guess_charset (const hashcat_ctx_t *hashcat_ctx); +int status_get_guess_mask_length (const hashcat_ctx_t *hashcat_ctx); +char *status_get_guess_candidates_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id); char *status_get_hash_type (const hashcat_ctx_t *hashcat_ctx); char *status_get_hash_target (const hashcat_ctx_t *hashcat_ctx); int status_get_digests_done (const hashcat_ctx_t *hashcat_ctx); diff --git a/include/types.h b/include/types.h index 3df3882c9..e69bab36e 100644 --- a/include/types.h +++ b/include/types.h @@ -460,25 +460,25 @@ typedef enum parser_rc } parser_rc_t; -typedef enum input_mode -{ - INPUT_MODE_NONE = 0, - INPUT_MODE_STRAIGHT_FILE = 1, - INPUT_MODE_STRAIGHT_FILE_RULES_FILE = 2, - INPUT_MODE_STRAIGHT_FILE_RULES_GEN = 3, - INPUT_MODE_STRAIGHT_STDIN = 4, - INPUT_MODE_STRAIGHT_STDIN_RULES_FILE = 5, - INPUT_MODE_STRAIGHT_STDIN_RULES_GEN = 6, - INPUT_MODE_COMBINATOR_BASE_LEFT = 7, - INPUT_MODE_COMBINATOR_BASE_RIGHT = 8, - INPUT_MODE_MASK = 9, - INPUT_MODE_MASK_CS = 10, - INPUT_MODE_HYBRID1 = 11, - INPUT_MODE_HYBRID1_CS = 12, - INPUT_MODE_HYBRID2 = 13, - INPUT_MODE_HYBRID2_CS = 14, - -} input_mode_t; +typedef enum guess_mode +{ + GUESS_MODE_NONE = 0, + GUESS_MODE_STRAIGHT_FILE = 1, + GUESS_MODE_STRAIGHT_FILE_RULES_FILE = 2, + GUESS_MODE_STRAIGHT_FILE_RULES_GEN = 3, + GUESS_MODE_STRAIGHT_STDIN = 4, + GUESS_MODE_STRAIGHT_STDIN_RULES_FILE = 5, + GUESS_MODE_STRAIGHT_STDIN_RULES_GEN = 6, + GUESS_MODE_COMBINATOR_BASE_LEFT = 7, + GUESS_MODE_COMBINATOR_BASE_RIGHT = 8, + GUESS_MODE_MASK = 9, + GUESS_MODE_MASK_CS = 10, + GUESS_MODE_HYBRID1 = 11, + GUESS_MODE_HYBRID1_CS = 12, + GUESS_MODE_HYBRID2 = 13, + GUESS_MODE_HYBRID2_CS = 14, + +} guess_mode_t; typedef enum progress_mode { @@ -1649,7 +1649,7 @@ typedef struct double hashes_msec_dev_benchmark; double exec_msec_dev; char *speed_sec_dev; - char *input_candidates_dev; + char *guess_candidates_dev; char *hwmon_dev; int corespeed_dev; int memoryspeed_dev; @@ -1662,17 +1662,17 @@ typedef struct { char *hash_target; char *hash_type; - int input_mode; - char *input_base; - int input_base_offset; - int input_base_count; - double input_base_percent; - char *input_mod; - int input_mod_offset; - int input_mod_count; - double input_mod_percent; - char *input_charset; - int input_mask_length; + int guess_mode; + char *guess_base; + int guess_base_offset; + int guess_base_count; + double guess_base_percent; + char *guess_mod; + int guess_mod_offset; + int guess_mod_count; + double guess_mod_percent; + char *guess_charset; + int guess_mask_length; char *session; char *status_string; int status_number; diff --git a/src/hashcat.c b/src/hashcat.c index d3c96212b..b1134d2d8 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -1264,17 +1264,17 @@ int hashcat_get_status (hashcat_ctx_t *hashcat_ctx, hashcat_status_t *hashcat_st hashcat_status->digests_percent = status_get_digests_percent (hashcat_ctx); hashcat_status->hash_target = status_get_hash_target (hashcat_ctx); hashcat_status->hash_type = status_get_hash_type (hashcat_ctx); - hashcat_status->input_base = status_get_input_base (hashcat_ctx); - hashcat_status->input_base_offset = status_get_input_base_offset (hashcat_ctx); - hashcat_status->input_base_count = status_get_input_base_count (hashcat_ctx); - hashcat_status->input_base_percent = status_get_input_base_percent (hashcat_ctx); - hashcat_status->input_mod = status_get_input_mod (hashcat_ctx); - hashcat_status->input_mod_offset = status_get_input_mod_offset (hashcat_ctx); - hashcat_status->input_mod_count = status_get_input_mod_count (hashcat_ctx); - hashcat_status->input_mod_percent = status_get_input_mod_percent (hashcat_ctx); - hashcat_status->input_charset = status_get_input_charset (hashcat_ctx); - hashcat_status->input_mask_length = status_get_input_mask_length (hashcat_ctx); - hashcat_status->input_mode = status_get_input_mode (hashcat_ctx); + hashcat_status->guess_base = status_get_guess_base (hashcat_ctx); + hashcat_status->guess_base_offset = status_get_guess_base_offset (hashcat_ctx); + hashcat_status->guess_base_count = status_get_guess_base_count (hashcat_ctx); + hashcat_status->guess_base_percent = status_get_guess_base_percent (hashcat_ctx); + hashcat_status->guess_mod = status_get_guess_mod (hashcat_ctx); + hashcat_status->guess_mod_offset = status_get_guess_mod_offset (hashcat_ctx); + hashcat_status->guess_mod_count = status_get_guess_mod_count (hashcat_ctx); + hashcat_status->guess_mod_percent = status_get_guess_mod_percent (hashcat_ctx); + hashcat_status->guess_charset = status_get_guess_charset (hashcat_ctx); + hashcat_status->guess_mask_length = status_get_guess_mask_length (hashcat_ctx); + hashcat_status->guess_mode = status_get_guess_mode (hashcat_ctx); hashcat_status->msec_paused = status_get_msec_paused (hashcat_ctx); hashcat_status->msec_running = status_get_msec_running (hashcat_ctx); hashcat_status->msec_real = status_get_msec_real (hashcat_ctx); @@ -1325,7 +1325,7 @@ int hashcat_get_status (hashcat_ctx_t *hashcat_ctx, hashcat_status_t *hashcat_st device_info->hashes_msec_dev_benchmark = status_get_hashes_msec_dev_benchmark (hashcat_ctx, device_id); device_info->exec_msec_dev = status_get_exec_msec_dev (hashcat_ctx, device_id); device_info->speed_sec_dev = status_get_speed_sec_dev (hashcat_ctx, device_id); - device_info->input_candidates_dev = status_get_input_candidates_dev (hashcat_ctx, device_id); + device_info->guess_candidates_dev = status_get_guess_candidates_dev (hashcat_ctx, device_id); device_info->hwmon_dev = status_get_hwmon_dev (hashcat_ctx, device_id); device_info->corespeed_dev = status_get_corespeed_dev (hashcat_ctx, device_id); device_info->memoryspeed_dev = status_get_memoryspeed_dev (hashcat_ctx, device_id); diff --git a/src/status.c b/src/status.c index 56941e710..d9cf422e3 100644 --- a/src/status.c +++ b/src/status.c @@ -326,7 +326,7 @@ char *status_get_hash_target (const hashcat_ctx_t *hashcat_ctx) } } -int status_get_input_mode (const hashcat_ctx_t *hashcat_ctx) +int status_get_guess_mode (const hashcat_ctx_t *hashcat_ctx) { const combinator_ctx_t *combinator_ctx = hashcat_ctx->combinator_ctx; const user_options_t *user_options = hashcat_ctx->user_options; @@ -356,30 +356,30 @@ int status_get_input_mode (const hashcat_ctx_t *hashcat_ctx) { if (has_rule_file == true) { - return INPUT_MODE_STRAIGHT_FILE_RULES_FILE; + return GUESS_MODE_STRAIGHT_FILE_RULES_FILE; } else if (has_rule_gen == true) { - return INPUT_MODE_STRAIGHT_FILE_RULES_GEN; + return GUESS_MODE_STRAIGHT_FILE_RULES_GEN; } else { - return INPUT_MODE_STRAIGHT_FILE; + return GUESS_MODE_STRAIGHT_FILE; } } else { if (has_rule_file == true) { - return INPUT_MODE_STRAIGHT_STDIN_RULES_FILE; + return GUESS_MODE_STRAIGHT_STDIN_RULES_FILE; } else if (has_rule_gen == true) { - return INPUT_MODE_STRAIGHT_STDIN_RULES_GEN; + return GUESS_MODE_STRAIGHT_STDIN_RULES_GEN; } else { - return INPUT_MODE_STRAIGHT_STDIN; + return GUESS_MODE_STRAIGHT_STDIN; } } } @@ -387,51 +387,51 @@ int status_get_input_mode (const hashcat_ctx_t *hashcat_ctx) { if (has_base_left == true) { - return INPUT_MODE_COMBINATOR_BASE_LEFT; + return GUESS_MODE_COMBINATOR_BASE_LEFT; } else { - return INPUT_MODE_COMBINATOR_BASE_RIGHT; + return GUESS_MODE_COMBINATOR_BASE_RIGHT; } } else if (user_options->attack_mode == ATTACK_MODE_BF) { if (has_mask_cs == true) { - return INPUT_MODE_MASK_CS; + return GUESS_MODE_MASK_CS; } else { - return INPUT_MODE_MASK; + return GUESS_MODE_MASK; } } else if (user_options->attack_mode == ATTACK_MODE_HYBRID1) { if (has_mask_cs == true) { - return INPUT_MODE_HYBRID1_CS; + return GUESS_MODE_HYBRID1_CS; } else { - return INPUT_MODE_HYBRID1; + return GUESS_MODE_HYBRID1; } } else if (user_options->attack_mode == ATTACK_MODE_HYBRID2) { if (has_mask_cs == true) { - return INPUT_MODE_HYBRID2_CS; + return GUESS_MODE_HYBRID2_CS; } else { - return INPUT_MODE_HYBRID2; + return GUESS_MODE_HYBRID2; } } - return INPUT_MODE_NONE; + return GUESS_MODE_NONE; } -char *status_get_input_base (const hashcat_ctx_t *hashcat_ctx) +char *status_get_guess_base (const hashcat_ctx_t *hashcat_ctx) { const user_options_t *user_options = hashcat_ctx->user_options; const user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra; @@ -480,7 +480,7 @@ char *status_get_input_base (const hashcat_ctx_t *hashcat_ctx) return NULL; } -int status_get_input_base_offset (const hashcat_ctx_t *hashcat_ctx) +int status_get_guess_base_offset (const hashcat_ctx_t *hashcat_ctx) { const user_options_t *user_options = hashcat_ctx->user_options; @@ -516,7 +516,7 @@ int status_get_input_base_offset (const hashcat_ctx_t *hashcat_ctx) return 0; } -int status_get_input_base_count (const hashcat_ctx_t *hashcat_ctx) +int status_get_guess_base_count (const hashcat_ctx_t *hashcat_ctx) { const user_options_t *user_options = hashcat_ctx->user_options; @@ -552,17 +552,17 @@ int status_get_input_base_count (const hashcat_ctx_t *hashcat_ctx) return 0; } -double status_get_input_base_percent (const hashcat_ctx_t *hashcat_ctx) +double status_get_guess_base_percent (const hashcat_ctx_t *hashcat_ctx) { - const int input_base_offset = status_get_input_base_offset (hashcat_ctx); - const int input_base_count = status_get_input_base_count (hashcat_ctx); + const int guess_base_offset = status_get_guess_base_offset (hashcat_ctx); + const int guess_base_count = status_get_guess_base_count (hashcat_ctx); - if (input_base_count == 0) return 0; + if (guess_base_count == 0) return 0; - return ((double) input_base_offset / (double) input_base_count) * 100; + return ((double) guess_base_offset / (double) guess_base_count) * 100; } -char *status_get_input_mod (const hashcat_ctx_t *hashcat_ctx) +char *status_get_guess_mod (const hashcat_ctx_t *hashcat_ctx) { const user_options_t *user_options = hashcat_ctx->user_options; @@ -603,7 +603,7 @@ char *status_get_input_mod (const hashcat_ctx_t *hashcat_ctx) return NULL; } -int status_get_input_mod_offset (const hashcat_ctx_t *hashcat_ctx) +int status_get_guess_mod_offset (const hashcat_ctx_t *hashcat_ctx) { const user_options_t *user_options = hashcat_ctx->user_options; @@ -635,7 +635,7 @@ int status_get_input_mod_offset (const hashcat_ctx_t *hashcat_ctx) return 0; } -int status_get_input_mod_count (const hashcat_ctx_t *hashcat_ctx) +int status_get_guess_mod_count (const hashcat_ctx_t *hashcat_ctx) { const user_options_t *user_options = hashcat_ctx->user_options; @@ -667,17 +667,17 @@ int status_get_input_mod_count (const hashcat_ctx_t *hashcat_ctx) return 0; } -double status_get_input_mod_percent (const hashcat_ctx_t *hashcat_ctx) +double status_get_guess_mod_percent (const hashcat_ctx_t *hashcat_ctx) { - const int input_mod_offset = status_get_input_mod_offset (hashcat_ctx); - const int input_mod_count = status_get_input_mod_count (hashcat_ctx); + const int guess_mod_offset = status_get_guess_mod_offset (hashcat_ctx); + const int guess_mod_count = status_get_guess_mod_count (hashcat_ctx); - if (input_mod_count == 0) return 0; + if (guess_mod_count == 0) return 0; - return ((double) input_mod_offset / (double) input_mod_count) * 100; + return ((double) guess_mod_offset / (double) guess_mod_count) * 100; } -char *status_get_input_charset (const hashcat_ctx_t *hashcat_ctx) +char *status_get_guess_charset (const hashcat_ctx_t *hashcat_ctx) { const user_options_t *user_options = hashcat_ctx->user_options; @@ -703,7 +703,7 @@ char *status_get_input_charset (const hashcat_ctx_t *hashcat_ctx) return NULL; } -int status_get_input_mask_length (const hashcat_ctx_t *hashcat_ctx) +int status_get_guess_mask_length (const hashcat_ctx_t *hashcat_ctx) { const mask_ctx_t *mask_ctx = hashcat_ctx->mask_ctx; @@ -714,7 +714,7 @@ int status_get_input_mask_length (const hashcat_ctx_t *hashcat_ctx) return mp_get_length (mask_ctx->mask); } -char *status_get_input_candidates_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id) +char *status_get_guess_candidates_dev (const hashcat_ctx_t *hashcat_ctx, const int device_id) { const hashconfig_t *hashconfig = hashcat_ctx->hashconfig; const opencl_ctx_t *opencl_ctx = hashcat_ctx->opencl_ctx; diff --git a/src/terminal.c b/src/terminal.c index dd316793f..68b37f296 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -745,255 +745,255 @@ void status_display (hashcat_ctx_t *hashcat_ctx) hashcat_status->time_estimated_absolute, hashcat_status->time_estimated_relative); - switch (hashcat_status->input_mode) + switch (hashcat_status->guess_mode) { - case INPUT_MODE_STRAIGHT_FILE: + case GUESS_MODE_STRAIGHT_FILE: event_log_info (hashcat_ctx, - "Input.Base.....: File (%s)", - hashcat_status->input_base); + "Guess.Base.....: File (%s)", + hashcat_status->guess_base); break; - case INPUT_MODE_STRAIGHT_FILE_RULES_FILE: + case GUESS_MODE_STRAIGHT_FILE_RULES_FILE: event_log_info (hashcat_ctx, - "Input.Base.....: File (%s)", - hashcat_status->input_base); + "Guess.Base.....: File (%s)", + hashcat_status->guess_base); event_log_info (hashcat_ctx, - "Input.Mod......: Rules (%s)", - hashcat_status->input_mod); + "Guess.Mod......: Rules (%s)", + hashcat_status->guess_mod); break; - case INPUT_MODE_STRAIGHT_FILE_RULES_GEN: + case GUESS_MODE_STRAIGHT_FILE_RULES_GEN: event_log_info (hashcat_ctx, - "Input.Base.....: File (%s)", - hashcat_status->input_base); + "Guess.Base.....: File (%s)", + hashcat_status->guess_base); event_log_info (hashcat_ctx, - "Input.Mod......: Rules (Generated)"); + "Guess.Mod......: Rules (Generated)"); break; - case INPUT_MODE_STRAIGHT_STDIN: + case GUESS_MODE_STRAIGHT_STDIN: event_log_info (hashcat_ctx, - "Input.Base.....: Pipe"); + "Guess.Base.....: Pipe"); break; - case INPUT_MODE_STRAIGHT_STDIN_RULES_FILE: + case GUESS_MODE_STRAIGHT_STDIN_RULES_FILE: event_log_info (hashcat_ctx, - "Input.Base.....: Pipe"); + "Guess.Base.....: Pipe"); event_log_info (hashcat_ctx, - "Input.Mod......: Rules (%s)", - hashcat_status->input_mod); + "Guess.Mod......: Rules (%s)", + hashcat_status->guess_mod); break; - case INPUT_MODE_STRAIGHT_STDIN_RULES_GEN: + case GUESS_MODE_STRAIGHT_STDIN_RULES_GEN: event_log_info (hashcat_ctx, - "Input.Base.....: Pipe"); + "Guess.Base.....: Pipe"); event_log_info (hashcat_ctx, - "Input.Mod......: Rules (Generated)"); + "Guess.Mod......: Rules (Generated)"); break; - case INPUT_MODE_COMBINATOR_BASE_LEFT: + case GUESS_MODE_COMBINATOR_BASE_LEFT: event_log_info (hashcat_ctx, - "Input.Base.....: File (%s), Left Side", - hashcat_status->input_base); + "Guess.Base.....: File (%s), Left Side", + hashcat_status->guess_base); event_log_info (hashcat_ctx, - "Input.Mod......: File (%s), Right Side", - hashcat_status->input_mod); + "Guess.Mod......: File (%s), Right Side", + hashcat_status->guess_mod); break; - case INPUT_MODE_COMBINATOR_BASE_RIGHT: + case GUESS_MODE_COMBINATOR_BASE_RIGHT: event_log_info (hashcat_ctx, - "Input.Base.....: File (%s), Right Side", - hashcat_status->input_base); + "Guess.Base.....: File (%s), Right Side", + hashcat_status->guess_base); event_log_info (hashcat_ctx, - "Input.Mod......: File (%s), Left Side", - hashcat_status->input_mod); + "Guess.Mod......: File (%s), Left Side", + hashcat_status->guess_mod); break; - case INPUT_MODE_MASK: + case GUESS_MODE_MASK: event_log_info (hashcat_ctx, - "Input.Mask.....: %s [%d]", - hashcat_status->input_base, - hashcat_status->input_mask_length); + "Guess.Mask.....: %s [%d]", + hashcat_status->guess_base, + hashcat_status->guess_mask_length); break; - case INPUT_MODE_MASK_CS: + case GUESS_MODE_MASK_CS: event_log_info (hashcat_ctx, - "Input.Mask.....: %s [%d]", - hashcat_status->input_base, - hashcat_status->input_mask_length); + "Guess.Mask.....: %s [%d]", + hashcat_status->guess_base, + hashcat_status->guess_mask_length); event_log_info (hashcat_ctx, - "Input.Charset..: %s ", - hashcat_status->input_charset); + "Guess.Charset..: %s ", + hashcat_status->guess_charset); break; - case INPUT_MODE_HYBRID1: + case GUESS_MODE_HYBRID1: event_log_info (hashcat_ctx, - "Input.Base.....: File (%s), Left Side", - hashcat_status->input_base); + "Guess.Base.....: File (%s), Left Side", + hashcat_status->guess_base); event_log_info (hashcat_ctx, - "Input.Mod......: Mask (%s) [%d], Right Side", - hashcat_status->input_mod, - hashcat_status->input_mask_length); + "Guess.Mod......: Mask (%s) [%d], Right Side", + hashcat_status->guess_mod, + hashcat_status->guess_mask_length); break; - case INPUT_MODE_HYBRID1_CS: + case GUESS_MODE_HYBRID1_CS: event_log_info (hashcat_ctx, - "Input.Base.....: File (%s), Left Side", - hashcat_status->input_base); + "Guess.Base.....: File (%s), Left Side", + hashcat_status->guess_base); event_log_info (hashcat_ctx, - "Input.Mod......: Mask (%s) [%d], Right Side", - hashcat_status->input_mod, - hashcat_status->input_mask_length); + "Guess.Mod......: Mask (%s) [%d], Right Side", + hashcat_status->guess_mod, + hashcat_status->guess_mask_length); event_log_info (hashcat_ctx, - "Input.Charset..: %s", - hashcat_status->input_charset); + "Guess.Charset..: %s", + hashcat_status->guess_charset); break; - case INPUT_MODE_HYBRID2: + case GUESS_MODE_HYBRID2: event_log_info (hashcat_ctx, - "Input.Base.....: File (%s), Right Side", - hashcat_status->input_base); + "Guess.Base.....: File (%s), Right Side", + hashcat_status->guess_base); event_log_info (hashcat_ctx, - "Input.Mod......: Mask (%s) [%d], Left Side", - hashcat_status->input_mod, - hashcat_status->input_mask_length); + "Guess.Mod......: Mask (%s) [%d], Left Side", + hashcat_status->guess_mod, + hashcat_status->guess_mask_length); break; - case INPUT_MODE_HYBRID2_CS: + case GUESS_MODE_HYBRID2_CS: event_log_info (hashcat_ctx, - "Input.Base.....: File (%s), Right Side", - hashcat_status->input_base); + "Guess.Base.....: File (%s), Right Side", + hashcat_status->guess_base); event_log_info (hashcat_ctx, - "Input.Mod......: Mask (%s) [%d], Left Side", - hashcat_status->input_mod, - hashcat_status->input_mask_length); + "Guess.Mod......: Mask (%s) [%d], Left Side", + hashcat_status->guess_mod, + hashcat_status->guess_mask_length); event_log_info (hashcat_ctx, - "Input.Charset..: %s", - hashcat_status->input_charset); + "Guess.Charset..: %s", + hashcat_status->guess_charset); break; } - switch (hashcat_status->input_mode) + switch (hashcat_status->guess_mode) { - case INPUT_MODE_STRAIGHT_FILE: + case GUESS_MODE_STRAIGHT_FILE: event_log_info (hashcat_ctx, - "Input.Queue....: %d/%d (%.02f%%)", - hashcat_status->input_base_offset, - hashcat_status->input_base_count, - hashcat_status->input_base_percent); + "Guess.Queue....: %d/%d (%.02f%%)", + hashcat_status->guess_base_offset, + hashcat_status->guess_base_count, + hashcat_status->guess_base_percent); break; - case INPUT_MODE_STRAIGHT_FILE_RULES_FILE: + case GUESS_MODE_STRAIGHT_FILE_RULES_FILE: event_log_info (hashcat_ctx, - "Input.Queue....: %d/%d (%.02f%%)", - hashcat_status->input_base_offset, - hashcat_status->input_base_count, - hashcat_status->input_base_percent); + "Guess.Queue....: %d/%d (%.02f%%)", + hashcat_status->guess_base_offset, + hashcat_status->guess_base_count, + hashcat_status->guess_base_percent); break; - case INPUT_MODE_STRAIGHT_FILE_RULES_GEN: + case GUESS_MODE_STRAIGHT_FILE_RULES_GEN: event_log_info (hashcat_ctx, - "Input.Queue....: %d/%d (%.02f%%)", - hashcat_status->input_base_offset, - hashcat_status->input_base_count, - hashcat_status->input_base_percent); + "Guess.Queue....: %d/%d (%.02f%%)", + hashcat_status->guess_base_offset, + hashcat_status->guess_base_count, + hashcat_status->guess_base_percent); break; - case INPUT_MODE_MASK: + case GUESS_MODE_MASK: event_log_info (hashcat_ctx, - "Input.Queue....: %d/%d (%.02f%%)", - hashcat_status->input_base_offset, - hashcat_status->input_base_count, - hashcat_status->input_base_percent); + "Guess.Queue....: %d/%d (%.02f%%)", + hashcat_status->guess_base_offset, + hashcat_status->guess_base_count, + hashcat_status->guess_base_percent); break; - case INPUT_MODE_MASK_CS: + case GUESS_MODE_MASK_CS: event_log_info (hashcat_ctx, - "Input.Queue....: %d/%d (%.02f%%)", - hashcat_status->input_base_offset, - hashcat_status->input_base_count, - hashcat_status->input_base_percent); + "Guess.Queue....: %d/%d (%.02f%%)", + hashcat_status->guess_base_offset, + hashcat_status->guess_base_count, + hashcat_status->guess_base_percent); break; - case INPUT_MODE_HYBRID1: + case GUESS_MODE_HYBRID1: event_log_info (hashcat_ctx, - "Input.Queue.Base.: %d/%d (%.02f%%)", - hashcat_status->input_base_offset, - hashcat_status->input_base_count, - hashcat_status->input_base_percent); + "Guess.Queue.Base: %d/%d (%.02f%%)", + hashcat_status->guess_base_offset, + hashcat_status->guess_base_count, + hashcat_status->guess_base_percent); event_log_info (hashcat_ctx, - "Input.Queue.Mod: %d/%d (%.02f%%)", - hashcat_status->input_mod_offset, - hashcat_status->input_mod_count, - hashcat_status->input_mod_percent); + "Guess.Queue.Mod: %d/%d (%.02f%%)", + hashcat_status->guess_mod_offset, + hashcat_status->guess_mod_count, + hashcat_status->guess_mod_percent); break; - case INPUT_MODE_HYBRID2: + case GUESS_MODE_HYBRID2: event_log_info (hashcat_ctx, - "Input.Queue.Base.: %d/%d (%.02f%%)", - hashcat_status->input_base_offset, - hashcat_status->input_base_count, - hashcat_status->input_base_percent); + "Guess.Queue.Base: %d/%d (%.02f%%)", + hashcat_status->guess_base_offset, + hashcat_status->guess_base_count, + hashcat_status->guess_base_percent); event_log_info (hashcat_ctx, - "Input.Queue.Mod: %d/%d (%.02f%%)", - hashcat_status->input_mod_offset, - hashcat_status->input_mod_count, - hashcat_status->input_mod_percent); + "Guess.Queue.Mod: %d/%d (%.02f%%)", + hashcat_status->guess_mod_offset, + hashcat_status->guess_mod_count, + hashcat_status->guess_mod_percent); break; } @@ -1080,11 +1080,11 @@ void status_display (hashcat_ctx_t *hashcat_ctx) if (device_info->skipped_dev == true) continue; - if (device_info->input_candidates_dev == NULL) continue; + if (device_info->guess_candidates_dev == NULL) continue; event_log_info (hashcat_ctx, "Candidates.#%d..: %s", device_id + 1, - device_info->input_candidates_dev); + device_info->guess_candidates_dev); } if (user_options->gpu_temp_disable == false)