arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-17 18:12:05 +00:00
Code Issues Releases Wiki Activity

Fix reported speed for slow hashes which was broken somewhere between hashcat (v3.10-809-g7fe575e) to hashcat (v3.10-820-g899413f)

Browse Source
This commit is contained in:
jsteube 2016-11-26 19:48:39 +01:00
parent 425031c9c3
commit a56aa30754
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/opencl.c
View File

@ -1938,32 +1938,31 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co
if (rc == -1) return -1; if (rc == -1) return -1;
/**
* benchmark
*/
if (user_options->speed_only == true) break;
/** /**
* speed * speed
*/ */
const u64 perf_sum_all = (u64) pws_cnt * (u64) innerloop_left; 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);
hc_timer_set (&device_param->timer_speed);
device_param->speed_cnt[speed_pos] = perf_sum_all;
device_param->speed_msec[speed_pos] = speed_msec;
speed_pos++;
if (speed_pos == SPEED_CACHE)
{ {
const double speed_msec = hc_timer_get (device_param->timer_speed); speed_pos = 0;
hc_timer_set (&device_param->timer_speed);
device_param->speed_cnt[speed_pos] = perf_sum_all;
device_param->speed_msec[speed_pos] = speed_msec;
speed_pos++;
if (speed_pos == SPEED_CACHE)
{
speed_pos = 0;
}
}
else
{
// speed for slow hashes is set inside choose_kernel()
} }
/** /**
@ -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); hc_thread_mutex_unlock (status_ctx->mux_counter);
/**
* benchmark
*/
if (user_options->speed_only == true) break;
/** /**
* result * result
*/ */