arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-25 09:22:36 +00:00
Code Issues Releases Wiki Activity

Fixed output of --speed-only and --progress-only in case a fast hash is used in combination with --slow-candidates

Browse Source
This commit is contained in:
Jens Steube 2018-11-12 14:20:42 +01:00
parent fb030e24ab
commit a402822646
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -44,6 +44,7 @@
- Fixed missing call to WSAStartup() and client indexing in order to start the brain server on Windows - Fixed missing call to WSAStartup() and client indexing in order to start the brain server on Windows
- Fixed out-of-bounds write in short-term memory of the brain-server - Fixed out-of-bounds write in short-term memory of the brain-server
- Fixed status output of progress value in case -S and -l used in combination - Fixed status output of progress value in case -S and -l used in combination
- Fixed output of --speed-only and --progress-only in case a fast hash is used in combination with --slow-candidates
## ##
## Technical ## Technical

42
src/opencl.c
View File

@ -2787,20 +2787,42 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co
} }
else else
{ {
double total = device_param->speed_msec[0]; double total_msec = device_param->speed_msec[0];
for (u32 speed_pos = 1; speed_pos < device_param->speed_pos; speed_pos++) for (u32 speed_pos = 1; speed_pos < device_param->speed_pos; speed_pos++)
{ {
total += device_param->speed_msec[speed_pos]; total_msec += device_param->speed_msec[speed_pos];
} }
// it's unclear if 4s is enough to turn on boost mode for all opencl device if (user_options->slow_candidates == true)
if ((total > 4000) || (device_param->speed_pos == SPEED_CACHE - 1))
{ {
device_param->speed_only_finish = true; if ((total_msec > 4000) || (device_param->speed_pos == SPEED_CACHE - 1))
{
const u32 speed_pos = device_param->speed_pos;
break; if (speed_pos)
{
device_param->speed_cnt[0] = device_param->speed_cnt[speed_pos - 1];
device_param->speed_msec[0] = device_param->speed_msec[speed_pos - 1];
}
device_param->speed_pos = 1;
device_param->speed_only_finish = true;
break;
}
}
else
{
// it's unclear if 4s is enough to turn on boost mode for all opencl device
if ((total_msec > 4000) || (device_param->speed_pos == SPEED_CACHE - 1))
{
device_param->speed_only_finish = true;
break;
}
} }
} }
} }
@ -2833,14 +2855,14 @@ int run_cracker (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, co
if (user_options->speed_only == true) if (user_options->speed_only == true)
{ {
double total = device_param->speed_msec[0]; double total_msec = device_param->speed_msec[0];
for (u32 speed_pos = 1; speed_pos < device_param->speed_pos; speed_pos++) for (u32 speed_pos = 1; speed_pos < device_param->speed_pos; speed_pos++)
{ {
total += device_param->speed_msec[speed_pos]; total_msec += device_param->speed_msec[speed_pos];
} }
device_param->outerloop_msec = total * hashes->salts_cnt * device_param->outerloop_multi; device_param->outerloop_msec = total_msec * hashes->salts_cnt * device_param->outerloop_multi;
} }
return 0; return 0;