diff --git a/docs/changes.txt b/docs/changes.txt index 05d84dd5f..fb3bbe0ac 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -23,6 +23,7 @@ - Fixed a typo that resulted in the minimum password length not being correctly initialized - Fixed a problem with parsing and displaying -m 7000 = Fortigate (FortiOS) hashes - Fixed --remove was not applied in case all hashes have been cracked by help of potfile or weak-hash check +- Fixed status view progress percentage in case -s was used ## ## Technical diff --git a/src/hashcat.c b/src/hashcat.c index 551a15df1..e637704a8 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -94,6 +94,8 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx) rd->words_cur = 0; + // --restore always overrides --skip + user_options->skip = 0; } } @@ -102,8 +104,6 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx) { status_ctx->words_off = user_options->skip; status_ctx->words_cur = status_ctx->words_off; - - user_options->skip = 0; } opencl_session_reset (hashcat_ctx); @@ -318,6 +318,11 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx) } } + // in case the user specified a --skip parameter we can use it only for the first inner loop + // we need to reset this + + user_options->skip = 0; + return 0; }