From 5b2b00ed7dddfa8f30d3e44f30e2c9e15c9e5f69 Mon Sep 17 00:00:00 2001 From: jsteube Date: Tue, 4 Oct 2016 23:21:10 +0200 Subject: [PATCH] Reset status to INIT after innerloop iteration --- src/hashcat.c | 2 ++ src/status.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/hashcat.c b/src/hashcat.c index 917cfe00d..1f82efe61 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -139,6 +139,8 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx) status_ctx->run_thread_level1 = true; status_ctx->run_thread_level2 = true; + status_ctx->devices_status = STATUS_INIT; + logfile_generate_subid (logfile_ctx); logfile_sub_msg ("START"); diff --git a/src/status.c b/src/status.c index 8949a11e7..6c247974e 100644 --- a/src/status.c +++ b/src/status.c @@ -875,11 +875,14 @@ void status_display (hashcat_ctx_t *hashcat_ctx) if (device_param->skipped) continue; + if (device_param->outerloop_left == 0) continue; // not ready + if (device_param->innerloop_left == 0) continue; + const u32 outerloop_first = 0; - const u32 outerloop_last = (device_param->outerloop_left) ? device_param->outerloop_left - 1 : 0; + const u32 outerloop_last = device_param->outerloop_left - 1; const u32 innerloop_first = 0; - const u32 innerloop_last = (device_param->innerloop_left) ? device_param->innerloop_left - 1 : 0; + const u32 innerloop_last = device_param->innerloop_left - 1; plain_t plain1 = { 0, 0, 0, outerloop_first, innerloop_first }; plain_t plain2 = { 0, 0, 0, outerloop_last, innerloop_last };