arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-11 16:21:12 +00:00
Code Issues Releases Wiki Activity

Move skipped_temp check out of main loop

Browse Source
This commit is contained in:
jsteube 2016-11-18 22:26:55 +01:00
parent e376ab7e6d
commit dc2689a996
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/opencl.c
View File

@ -3135,7 +3135,6 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
}
u32 hardware_power_all = 0;
u32 skipped = 0;
for (u32 device_id = 0; device_id < opencl_ctx->devices_cnt; device_id++)
{
@ -3190,7 +3189,6 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
event_log_warning (hashcat_ctx, "* Device #%u: skipping unstable hash-mode %u for this specific device, use --force to override", device_id + 1, user_options->hash_mode);
device_param->skipped_temp = true;
skipped++;
device_param->skipped = true;
@ -4754,7 +4752,18 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
hardware_power_all += device_param->hardware_power;
}
if (hardware_power_all == 0) return ((opencl_ctx->devices_cnt - skipped) == 0) ? 1 : -1;
// Prevent exit from benchmark mode if all devices are skipped due to unstable hash-modes (OSX)
bool has_skipped_temp = false;
for (u32 device_id = 0; device_id < opencl_ctx->devices_cnt; device_id++)
{
hc_device_param_t *device_param = &opencl_ctx->devices_param[device_id];
if (device_param->skipped_temp == true) has_skipped_temp = true;
}
if ((hardware_power_all == 0) && (has_skipped_temp == false)) return -1;
opencl_ctx->hardware_power_all = hardware_power_all;