From a56aa30754e5c852748f981622478d1b24c0f440 Mon Sep 17 00:00:00 2001 From: jsteube Date: Sat, 26 Nov 2016 19:48:39 +0100 Subject: [PATCH] Fix reported speed for slow hashes which was broken somewhere between hashcat (v3.10-809-g7fe575e) to hashcat (v3.10-820-g899413f) --- src/opencl.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/src/opencl.c b/src/opencl.c index b9fac99c2..814bca212 100644 --- a/src/opencl.c +++ b/src/opencl.c @@ -1938,32 +1938,31 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co if (rc == -1) return -1; + /** + * benchmark + */ + + if (user_options->speed_only == true) break; + /** * speed */ const u64 perf_sum_all = (u64) pws_cnt * (u64) innerloop_left; - if (hashconfig->attack_exec == ATTACK_EXEC_INSIDE_KERNEL) - { - const double speed_msec = hc_timer_get (device_param->timer_speed); + const double speed_msec = hc_timer_get (device_param->timer_speed); - hc_timer_set (&device_param->timer_speed); + hc_timer_set (&device_param->timer_speed); - device_param->speed_cnt[speed_pos] = perf_sum_all; + device_param->speed_cnt[speed_pos] = perf_sum_all; - device_param->speed_msec[speed_pos] = speed_msec; + device_param->speed_msec[speed_pos] = speed_msec; - speed_pos++; + speed_pos++; - if (speed_pos == SPEED_CACHE) - { - speed_pos = 0; - } - } - else + if (speed_pos == SPEED_CACHE) { - // speed for slow hashes is set inside choose_kernel() + speed_pos = 0; } /** @@ -1976,12 +1975,6 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co hc_thread_mutex_unlock (status_ctx->mux_counter); - /** - * benchmark - */ - - if (user_options->speed_only == true) break; - /** * result */