From 1156cf72071ff152e1dc20d88081ca2bf953a9a8 Mon Sep 17 00:00:00 2001 From: jsteube Date: Sat, 17 Nov 2018 14:40:30 +0100 Subject: [PATCH] Fixed invalid hardware monitor detection in benchmark mode Fixes https://github.com/hashcat/hashcat/issues/1787 --- docs/changes.txt | 1 + src/hwmon.c | 2 -- src/user_options.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 1b657f036..d6a5598e7 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -42,6 +42,7 @@ - Fixed checking the length of the last token in a hash if it was given the attribute TOKEN_ATTR_FIXED_LENGTH - Fixed endianness and invalid separator character in outfile format for hash-mode 16801 (WPA-PMKID-PMK) - Fixed ignoring --brain-client-features configuration when brain server has attack-position information from a previous run +- Fixed invalid hardware monitor detection in benchmark mode - Fixed invalid warnings about throttling when --hwmon-disable was used - Fixed missing call to WSACleanup() to cleanly shutdown windows sockets system - Fixed missing call to WSAStartup() and client indexing in order to start the brain server on Windows diff --git a/src/hwmon.c b/src/hwmon.c index 8f561e49c..dc02a8311 100644 --- a/src/hwmon.c +++ b/src/hwmon.c @@ -2012,9 +2012,7 @@ int hwmon_ctx_init (hashcat_ctx_t *hashcat_ctx) if (user_options->keyspace == true) return 0; if (user_options->left == true) return 0; if (user_options->opencl_info == true) return 0; - if (user_options->progress_only == true) return 0; if (user_options->show == true) return 0; - if (user_options->speed_only == true) return 0; if (user_options->stdout_flag == true) return 0; if (user_options->usage == true) return 0; if (user_options->version == true) return 0; diff --git a/src/user_options.c b/src/user_options.c index c98f6a6df..6485173d0 100644 --- a/src/user_options.c +++ b/src/user_options.c @@ -1484,7 +1484,7 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx) if (user_options->benchmark == true) { user_options->attack_mode = ATTACK_MODE_BF; - user_options->hwmon_disable = true; + user_options->hwmon_temp_abort = 0; user_options->increment = false; user_options->left = false; user_options->logfile_disable = true;