Fixed unintentional overwriting of the --quiet option in benchmark and speed-only mode

pull/2943/head
Jens Steube 3 years ago
parent 50e28ff306
commit 330ad34f17

@ -27,6 +27,7 @@
- Fixed segfault when a combination of the flags --user and --show is given and a hash was specified directly on the command line - Fixed segfault when a combination of the flags --user and --show is given and a hash was specified directly on the command line
- Fixed syntax check of HAS_VPERM macro in several kernel includes causing invalid error message for AMD GPUs on Windows - Fixed syntax check of HAS_VPERM macro in several kernel includes causing invalid error message for AMD GPUs on Windows
- Fixed uninitialized tmps variable in autotune for slow hashes by calling _init and _prepare kernel before calling _loop kernel - Fixed uninitialized tmps variable in autotune for slow hashes by calling _init and _prepare kernel before calling _loop kernel
- Fixed unintentional overwriting of the --quiet option in benchmark and speed-only mode
## ##
## Performance ## Performance

@ -1624,6 +1624,8 @@ int hashcat_session_execute (hashcat_ctx_t *hashcat_ctx)
if (user_options->benchmark == true) if (user_options->benchmark == true)
{ {
const bool quiet_sav = user_options->quiet;
user_options->quiet = true; user_options->quiet = true;
if (user_options->hash_mode_chgd == true) if (user_options->hash_mode_chgd == true)
@ -1648,17 +1650,19 @@ int hashcat_session_execute (hashcat_ctx_t *hashcat_ctx)
} }
} }
user_options->quiet = false; user_options->quiet = quiet_sav;
} }
else else
{ {
const bool quiet_sav = user_options->quiet;
if (user_options->speed_only == true) user_options->quiet = true; if (user_options->speed_only == true) user_options->quiet = true;
rc_final = outer_loop (hashcat_ctx); rc_final = outer_loop (hashcat_ctx);
if (rc_final == -1) myabort (hashcat_ctx); if (rc_final == -1) myabort (hashcat_ctx);
if (user_options->speed_only == true) user_options->quiet = false; if (user_options->speed_only == true) user_options->quiet = quiet_sav;
} }
EVENT (EVENT_OUTERLOOP_FINISHED); EVENT (EVENT_OUTERLOOP_FINISHED);

Loading…
Cancel
Save