From 7bea7ca177fb340c998ec16170391a5f53ca50e3 Mon Sep 17 00:00:00 2001 From: Royce Williams Date: Sun, 6 Jun 2021 10:47:18 -0800 Subject: [PATCH] tighten output to be physical-terminal friendly --- src/backend.c | 36 +++++++++++++++++++----------------- src/hashcat.c | 2 +- src/interface.c | 7 ++++--- src/main.c | 16 ++++++++-------- src/rp.c | 2 +- src/straight.c | 3 ++- src/user_options.c | 12 ++++++------ 7 files changed, 41 insertions(+), 37 deletions(-) diff --git a/src/backend.c b/src/backend.c index 94361125f..3e926a59a 100644 --- a/src/backend.c +++ b/src/backend.c @@ -6496,8 +6496,8 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) { event_log_error (hashcat_ctx, "* Device #%u: Outdated POCL OpenCL driver detected!", device_id + 1); - if (user_options->quiet == false) event_log_warning (hashcat_ctx, "This OpenCL driver has been marked as likely to fail kernel compilation or to produce false negatives."); - if (user_options->quiet == false) event_log_warning (hashcat_ctx, "You can use --force to override this, but do not report related errors."); + if (user_options->quiet == false) event_log_warning (hashcat_ctx, "This OpenCL driver may fail kernel compilation or produce false negatives."); + if (user_options->quiet == false) event_log_warning (hashcat_ctx, "You can use --force to override, but do not report related errors."); if (user_options->quiet == false) event_log_warning (hashcat_ctx, NULL); device_param->skipped = true; @@ -6525,8 +6525,8 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) { event_log_error (hashcat_ctx, "* Device #%u: Unstable OpenCL driver detected!", device_id + 1); - if (user_options->quiet == false) event_log_warning (hashcat_ctx, "This OpenCL driver has been marked as likely to fail kernel compilation or to produce false negatives."); - if (user_options->quiet == false) event_log_warning (hashcat_ctx, "You can use --force to override this, but do not report related errors."); + if (user_options->quiet == false) event_log_warning (hashcat_ctx, "This OpenCL driver may fail kernel compilation or produce false negatives."); + if (user_options->quiet == false) event_log_warning (hashcat_ctx, "You can use --force to override, but do not report related errors."); if (user_options->quiet == false) event_log_warning (hashcat_ctx, NULL); device_param->skipped = true; @@ -6584,9 +6584,9 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) { if (user_options->quiet == false) event_log_warning (hashcat_ctx, "* Device #%u: Apple's OpenCL drivers (GPU) are known to be unreliable.", device_id + 1); if (user_options->quiet == false) event_log_warning (hashcat_ctx, " You have been warned."); - //if (user_options->quiet == false) event_log_warning (hashcat_ctx, " There are many reports of false negatives and other issues."); - //if (user_options->quiet == false) event_log_warning (hashcat_ctx, " This is not a hashcat specific issue. Many other projects suffer from the bad quality of these drivers."); - //if (user_options->quiet == false) event_log_warning (hashcat_ctx, " You can use --force to override, but do not report related errors. You have been warned."); + //if (user_options->quiet == false) event_log_warning (hashcat_ctx, " There are many reports of false negatives and other issues."); + //if (user_options->quiet == false) event_log_warning (hashcat_ctx, " This is not a hashcat issue. Other projects report issues with these drivers."); + //if (user_options->quiet == false) event_log_warning (hashcat_ctx, " You can use --force to override, but do not report related errors. You have been warned."); if (user_options->quiet == false) event_log_warning (hashcat_ctx, NULL); //device_param->skipped = true; @@ -6740,9 +6740,9 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) event_log_warning (hashcat_ctx, NULL); } - event_log_warning (hashcat_ctx, "* Device #%u: CUDA SDK Toolkit installation NOT detected or incorrectly installed.", device_id + 1); - event_log_warning (hashcat_ctx, " CUDA SDK Toolkit installation required for proper device support and utilization"); - event_log_warning (hashcat_ctx, " Falling back to OpenCL Runtime"); + event_log_warning (hashcat_ctx, "* Device #%u: CUDA SDK Toolkit not installed or incorrectly installed.", device_id + 1); + event_log_warning (hashcat_ctx, " CUDA SDK Toolkit required for proper device support and utilization."); + event_log_warning (hashcat_ctx, " Falling back to OpenCL runtime."); event_log_warning (hashcat_ctx, NULL); } @@ -6814,8 +6814,8 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) { event_log_error (hashcat_ctx, "* Device #%u: Outdated or broken Intel OpenCL runtime '%s' detected!", device_id + 1, device_param->opencl_driver_version); - event_log_warning (hashcat_ctx, "You are STRONGLY encouraged to use the officially supported Intel OpenCL runtime."); - event_log_warning (hashcat_ctx, "See hashcat.net for officially supported Intel OpenCL runtime."); + event_log_warning (hashcat_ctx, "You are STRONGLY encouraged to use the officially supported runtime."); + event_log_warning (hashcat_ctx, "See hashcat.net for the officially supported Intel OpenCL runtime."); event_log_warning (hashcat_ctx, "See also: https://hashcat.net/faq/wrongdriver"); event_log_warning (hashcat_ctx, "You can use --force to override this, but do not report related errors."); event_log_warning (hashcat_ctx, NULL); @@ -6853,7 +6853,7 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) { event_log_error (hashcat_ctx, "* Device #%u: Outdated or broken AMD driver '%s' detected!", device_id + 1, device_param->opencl_driver_version); - event_log_warning (hashcat_ctx, "You are STRONGLY encouraged to use the officially supported AMD driver."); + event_log_warning (hashcat_ctx, "You are STRONGLY encouraged to use the officially supported driver."); event_log_warning (hashcat_ctx, "See hashcat.net for officially supported AMD drivers."); event_log_warning (hashcat_ctx, "See also: https://hashcat.net/faq/wrongdriver"); event_log_warning (hashcat_ctx, "You can use --force to override this, but do not report related errors."); @@ -6903,7 +6903,7 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) event_log_warning (hashcat_ctx, "* Device #%u: Outdated or broken NVIDIA driver '%s' detected!", device_id + 1, device_param->opencl_driver_version); event_log_warning (hashcat_ctx, NULL); - event_log_warning (hashcat_ctx, "You are STRONGLY encouraged to use the officially supported NVIDIA driver."); + event_log_warning (hashcat_ctx, "You are STRONGLY encouraged to use the officially supported driver."); event_log_warning (hashcat_ctx, "See hashcat's homepage for officially supported NVIDIA drivers."); event_log_warning (hashcat_ctx, "See also: https://hashcat.net/faq/wrongdriver"); event_log_warning (hashcat_ctx, "You can use --force to override this, but do not report related errors."); @@ -8090,7 +8090,8 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) if ((unstable_warning == true) && (user_options->force == false)) { - event_log_warning (hashcat_ctx, "* Device #%u: Skipping hash-mode %u - known CUDA/OpenCL Runtime/Driver issue (not a hashcat issue)", device_id + 1, hashconfig->hash_mode); + event_log_warning (hashcat_ctx, "* Device #%u: Skipping hash-mode %u)", device_id + 1, hashconfig->hash_mode); + event_log_warning (hashcat_ctx, " This is due to a known CUDA/OpenCL runtime/driver issue (not a hashcat issue)"); event_log_warning (hashcat_ctx, " You can use --force to override, but do not report related errors."); device_param->skipped_warning = true; @@ -9075,7 +9076,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) if (size_total_fixed > device_param->device_available_mem) { - event_log_error (hashcat_ctx, "* Device #%u: Not enough allocatable device memory for this hashlist and/or ruleset.", device_id + 1); + event_log_error (hashcat_ctx, "* Device #%u: Not enough allocatable device memory for this hashlist/ruleset.", device_id + 1); return -1; } @@ -10835,7 +10836,8 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx) if (kernel_accel_min > kernel_accel_max) { - event_log_error (hashcat_ctx, "* Device #%u: Too many compute units to keep minimum kernel accel limit. Retry with lower --backend-kernel-threads value.", device_id + 1); + event_log_error (hashcat_ctx, "* Device #%u: Too many compute units to keep minimum kernel accel limit.", device_id + 1); + event_log_error (hashcat_ctx, " Retry with lower --backend-kernel-threads value."); return -1; } diff --git a/src/hashcat.c b/src/hashcat.c index 5ab98d823..c7532f61e 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -761,7 +761,7 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx) { event_log_error (hashcat_ctx, "Aborting session due to kernel self-test failure."); - event_log_warning (hashcat_ctx, "You can use --self-test-disable to override this, but do not report related errors."); + event_log_warning (hashcat_ctx, "You can use --self-test-disable to override, but do not report related errors."); event_log_warning (hashcat_ctx, NULL); return -1; diff --git a/src/interface.c b/src/interface.c index 8b0d4c8a3..2f7b15ccf 100644 --- a/src/interface.c +++ b/src/interface.c @@ -304,8 +304,8 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) { if (user_options->quiet == false && user_options->autodetect == false) { - event_log_warning (hashcat_ctx, "This hash-mode is known to emit multiple valid password candidates for the same hash."); - event_log_warning (hashcat_ctx, "Use --keep-guessing to prevent hashcat from shutdown after the hash has been cracked."); + event_log_warning (hashcat_ctx, "This hash-mode is known to emit multiple valid candidates for the same hash."); + event_log_warning (hashcat_ctx, "Use --keep-guessing to continue attack after finding the first crack."); event_log_warning (hashcat_ctx, NULL); } } @@ -342,7 +342,8 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) if (user_options->quiet == false) { event_log_warning (hashcat_ctx, "Kernel %s:", source_file); - event_log_warning (hashcat_ctx, "Optimized kernel requested but not available or not required - falling back to pure kernel"); + event_log_warning (hashcat_ctx, "Optimized kernel requested, but not available or not required"); + event_log_warning (hashcat_ctx, "Falling back to pure kernel"); event_log_warning (hashcat_ctx, NULL); } } diff --git a/src/main.c b/src/main.c index c29a7b152..f98673bd8 100644 --- a/src/main.c +++ b/src/main.c @@ -493,8 +493,8 @@ static void main_outerloop_mainscreen (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx, if (hashconfig->has_optimized_kernel == true) { event_log_advice (hashcat_ctx, "ATTENTION! Pure (unoptimized) backend kernels selected."); - event_log_advice (hashcat_ctx, "Using pure kernels enables cracking longer passwords but for the price of drastically reduced performance."); - event_log_advice (hashcat_ctx, "If you want to switch to optimized backend kernels, append -O to your commandline."); + event_log_advice (hashcat_ctx, "Pure kernels can crack longer passwords, but drastically reduce performance."); + event_log_advice (hashcat_ctx, "If you want to switch to optimized kernels, append -O to your commandline."); event_log_advice (hashcat_ctx, "See the above message to find out about the exact limits."); event_log_advice (hashcat_ctx, NULL); } @@ -717,7 +717,7 @@ static void main_monitor_performance_hint (MAYBE_UNUSED hashcat_ctx_t *hashcat_c if (hashconfig->has_optimized_kernel == true) { event_log_advice (hashcat_ctx, "* Append -O to the commandline."); - event_log_advice (hashcat_ctx, " This lowers the maximum supported password- and salt-length (typically down to 32)."); + event_log_advice (hashcat_ctx, " This lowers the maximum supported password/salt length (usually down to 32)."); event_log_advice (hashcat_ctx, NULL); } } @@ -733,7 +733,7 @@ static void main_monitor_performance_hint (MAYBE_UNUSED hashcat_ctx_t *hashcat_c if (user_options->slow_candidates == false) { event_log_advice (hashcat_ctx, "* Append -S to the commandline."); - event_log_advice (hashcat_ctx, " This has a drastic effect but only for context specific attack configurations."); + event_log_advice (hashcat_ctx, " This has a drastic speed impact but can be better for specific attacks."); event_log_advice (hashcat_ctx, " Typical scenarios are a small wordlist but a large ruleset."); event_log_advice (hashcat_ctx, NULL); } @@ -758,10 +758,10 @@ static void main_monitor_noinput_hint (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx, if (user_options->quiet == true) return; - event_log_advice (hashcat_ctx, "ATTENTION! Read timeout in stdin mode. The password candidates input is too slow:"); - event_log_advice (hashcat_ctx, "* Are you sure that you are using the correct attack mode (--attack-mode or -a)?"); - event_log_advice (hashcat_ctx, "* Are you sure that you want to use input from standard input (stdin)?"); - event_log_advice (hashcat_ctx, "* If so, are you sure that the input from stdin (the pipe) is working correctly and is fast enough?"); + event_log_advice (hashcat_ctx, "ATTENTION! Read timeout in stdin mode. Password candidates input is too slow:"); + event_log_advice (hashcat_ctx, "* Are you sure you are using the correct attack mode (--attack-mode or -a)?"); + event_log_advice (hashcat_ctx, "* Are you sure you want to use input from standard input (stdin)?"); + event_log_advice (hashcat_ctx, "* If using stdin, are you sure it is working correctly, and is fast enough?"); event_log_advice (hashcat_ctx, NULL); } diff --git a/src/rp.c b/src/rp.c index 63c0f5ba9..019b6333c 100644 --- a/src/rp.c +++ b/src/rp.c @@ -837,7 +837,7 @@ int kernel_rules_load (hashcat_ctx_t *hashcat_ctx, kernel_rule_t **out_buf, u32 { if (out_pos == RULES_MAX - 1) { - // event_log_warning (hashcat_ctx, "Truncated chaining of rule %d and rule %d - maximum functions per rule exceeded.", i, in_off); + // event_log_warning (hashcat_ctx, "Truncated chaining of rules %d and %d - maximum functions per rule exceeded.", i, in_off); break; } diff --git a/src/straight.c b/src/straight.c index dfe71a668..d9cc2b3c3 100644 --- a/src/straight.c +++ b/src/straight.c @@ -236,7 +236,8 @@ int straight_ctx_update_loop (hashcat_ctx_t *hashcat_ctx) if ((status_ctx->words_cnt / straight_ctx->kernel_rules_cnt) != hashes->salts_cnt) { - event_log_error (hashcat_ctx, "Number of words in wordlist %s is not in sync with number of salts (words: %" PRIu64 ", salts: %d)", straight_ctx->dict, status_ctx->words_cnt / straight_ctx->kernel_rules_cnt, hashes->salts_cnt); + event_log_error (hashcat_ctx, "Wordlist %s word count is not in sync with salt count", straight_ctx->dict); + event_log_error (hashcat_ctx, "Words: %" PRIu64 ", salts: %d", status_ctx->words_cnt / straight_ctx->kernel_rules_cnt, hashes->salts_cnt); return -1; } diff --git a/src/user_options.c b/src/user_options.c index 4abddd4cc..bc4465c5c 100644 --- a/src/user_options.c +++ b/src/user_options.c @@ -728,14 +728,14 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx) if ((user_options->veracrypt_pim_start_chgd == true) && (user_options->veracrypt_pim_stop_chgd == false)) { - event_log_error (hashcat_ctx, "If --veracrypt-pim-start is specified then --veracrypt-pim-stop needs to be specified, too."); + event_log_error (hashcat_ctx, "The--veracrypt-pim-start option requires --veracrypt-pim-stop as well."); return -1; } if ((user_options->veracrypt_pim_start_chgd == false) && (user_options->veracrypt_pim_stop_chgd == true)) { - event_log_error (hashcat_ctx, "If --veracrypt-pim-stop is specified then --veracrypt-pim-start needs to be specified, too."); + event_log_error (hashcat_ctx, "The --veracrypt-pim-stop option requires --veracrypt-pim-start as well."); return -1; } @@ -814,7 +814,7 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx) { if ((user_options->attack_mode != ATTACK_MODE_STRAIGHT) && (user_options->attack_mode != ATTACK_MODE_ASSOCIATION)) { - event_log_error (hashcat_ctx, "Use of -r/--rules-file and -g/--rules-generate only allowed in attack mode 0 or 9."); + event_log_error (hashcat_ctx, "Use of -r/--rules-file and -g/--rules-generate requires attack mode 0 or 9."); return -1; } @@ -1011,7 +1011,7 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx) { if ((user_options->rp_files_cnt == 0) && (user_options->rp_gen == 0)) { - event_log_error (hashcat_ctx, "Parameter --loopback not allowed without -r/--rules-file or -g/--rules-generate."); + event_log_error (hashcat_ctx, "Parameter --loopback requires either -r/--rules-file or -g/--rules-generate."); return -1; } @@ -2829,7 +2829,7 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx) { event_log_error (hashcat_ctx, "%s: %s", modulefile, strerror (errno)); - event_log_warning (hashcat_ctx, "If you are using the hashcat binary package this error typically indicates a problem during extraction."); + event_log_warning (hashcat_ctx, "If you are using the hashcat binary package, this may be an extraction issue."); event_log_warning (hashcat_ctx, "For example, using \"7z e\" instead of using \"7z x\"."); event_log_warning (hashcat_ctx, NULL); @@ -2862,7 +2862,7 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx) { event_log_error (hashcat_ctx, "%s: %s", kernelfile, strerror (errno)); - event_log_warning (hashcat_ctx, "If you are using the hashcat binary package this error typically indicates a problem during extraction."); + event_log_warning (hashcat_ctx, "If you are using the hashcat binary package, this may be an extraction issue."); event_log_warning (hashcat_ctx, "For example, using \"7z e\" instead of using \"7z x\"."); event_log_warning (hashcat_ctx, NULL);