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

Do not show a candidate on status screen if device is copying or generating candidates

Browse Source
This commit is contained in:
jsteube 2016-10-05 16:02:19 +02:00
parent 15d2f9b11e
commit b751a9d438
1 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/status.c
View File

@ -869,56 +869,66 @@ void status_display (hashcat_ctx_t *hashcat_ctx)
} }
} }
for (u32 device_id = 0; device_id < opencl_ctx->devices_cnt; device_id++) if (status_ctx->run_main_level1 == true)
{ {
hc_device_param_t *device_param = &opencl_ctx->devices_param[device_id]; for (u32 device_id = 0; device_id < opencl_ctx->devices_cnt; device_id++)
if (device_param->skipped) continue;
if ((device_param->outerloop_left == 0) || (device_param->innerloop_left == 0))
{ {
log_info ("Candidates.#%d..: [Copying/Generating]", device_id + 1); hc_device_param_t *device_param = &opencl_ctx->devices_param[device_id];
continue; if (device_param->skipped) continue;
}
const u32 outerloop_first = 0; if ((device_param->outerloop_left == 0) || (device_param->innerloop_left == 0))
const u32 outerloop_last = device_param->outerloop_left - 1; {
if (user_options_extra->attack_kern == ATTACK_KERN_BF)
{
log_info ("Candidates.#%d..: [Generating]", device_id + 1);
}
else
{
log_info ("Candidates.#%d..: [Copying]", device_id + 1);
}
const u32 innerloop_first = 0; continue;
const u32 innerloop_last = device_param->innerloop_left - 1; }
plain_t plain1 = { 0, 0, 0, outerloop_first, innerloop_first }; const u32 outerloop_first = 0;
plain_t plain2 = { 0, 0, 0, outerloop_last, innerloop_last }; const u32 outerloop_last = device_param->outerloop_left - 1;
u32 plain_buf1[16] = { 0 }; const u32 innerloop_first = 0;
u32 plain_buf2[16] = { 0 }; const u32 innerloop_last = device_param->innerloop_left - 1;
u8 *plain_ptr1 = (u8 *) plain_buf1; plain_t plain1 = { 0, 0, 0, outerloop_first, innerloop_first };
u8 *plain_ptr2 = (u8 *) plain_buf2; plain_t plain2 = { 0, 0, 0, outerloop_last, innerloop_last };
int plain_len1 = 0; u32 plain_buf1[16] = { 0 };
int plain_len2 = 0; u32 plain_buf2[16] = { 0 };
build_plain (hashcat_ctx, device_param, &plain1, plain_buf1, &plain_len1); u8 *plain_ptr1 = (u8 *) plain_buf1;
build_plain (hashcat_ctx, device_param, &plain2, plain_buf2, &plain_len2); u8 *plain_ptr2 = (u8 *) plain_buf2;
bool need_hex1 = need_hexify (plain_ptr1, plain_len1); int plain_len1 = 0;
bool need_hex2 = need_hexify (plain_ptr2, plain_len2); int plain_len2 = 0;
if ((need_hex1 == true) || (need_hex2 == true)) build_plain (hashcat_ctx, device_param, &plain1, plain_buf1, &plain_len1);
{ build_plain (hashcat_ctx, device_param, &plain2, plain_buf2, &plain_len2);
exec_hexify (plain_ptr1, plain_len1, plain_ptr1);
exec_hexify (plain_ptr2, plain_len2, plain_ptr2);
plain_ptr1[plain_len1 * 2] = 0; bool need_hex1 = need_hexify (plain_ptr1, plain_len1);
plain_ptr2[plain_len2 * 2] = 0; bool need_hex2 = need_hexify (plain_ptr2, plain_len2);
log_info ("Candidates.#%d..: $HEX[%s] -> $HEX[%s]", device_id + 1, plain_ptr1, plain_ptr2); if ((need_hex1 == true) || (need_hex2 == true))
} {
else exec_hexify (plain_ptr1, plain_len1, plain_ptr1);
{ exec_hexify (plain_ptr2, plain_len2, plain_ptr2);
log_info ("Candidates.#%d..: %s -> %s", device_id + 1, plain_ptr1, plain_ptr2);
plain_ptr1[plain_len1 * 2] = 0;
plain_ptr2[plain_len2 * 2] = 0;
log_info ("Candidates.#%d..: $HEX[%s] -> $HEX[%s]", device_id + 1, plain_ptr1, plain_ptr2);
}
else
{
log_info ("Candidates.#%d..: %s -> %s", device_id + 1, plain_ptr1, plain_ptr2);
}
} }
} }