arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-14 09:40:59 +00:00
Code Issues Releases Wiki Activity

Fixed status output of progress value in case -S and -l used in combination

Browse Source
This commit is contained in:
Jens Steube 2018-11-07 14:20:40 +01:00
parent 5bb7b5c750
commit b1a460ade2
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -31,6 +31,7 @@
## Bugs ## Bugs
## ##
- Fixed status output of progress value in case -S and -l used in combination
- Fixed calculation of brain-attack if a given wordlist has the size zero - Fixed calculation of brain-attack if a given wordlist has the size zero
- Fixed automated calculation of brain-session when not using all hashes in the hashlist - Fixed automated calculation of brain-session when not using all hashes in the hashlist
- Fixed endianness and invalid separator character in outfile format for hash-mode 16801 (WPA-PMKID-PMK) - Fixed endianness and invalid separator character in outfile format for hash-mode 16801 (WPA-PMKID-PMK)

26
src/status.c
View File

@ -1351,9 +1351,16 @@ u64 status_get_progress_end (const hashcat_ctx_t *hashcat_ctx)
progress_end = MIN (user_options->limit, status_ctx->words_base) * hashes->salts_cnt; progress_end = MIN (user_options->limit, status_ctx->words_base) * hashes->salts_cnt;
if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) progress_end *= straight_ctx->kernel_rules_cnt; if (user_options->slow_candidates == true)
else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) progress_end *= combinator_ctx->combs_cnt; {
else if (user_options_extra->attack_kern == ATTACK_KERN_BF) progress_end *= mask_ctx->bfs_cnt; // nothing to do
}
else
{
if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) progress_end *= straight_ctx->kernel_rules_cnt;
else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) progress_end *= combinator_ctx->combs_cnt;
else if (user_options_extra->attack_kern == ATTACK_KERN_BF) progress_end *= mask_ctx->bfs_cnt;
}
} }
return progress_end; return progress_end;
@ -1376,9 +1383,16 @@ u64 status_get_progress_skip (const hashcat_ctx_t *hashcat_ctx)
progress_skip = MIN (user_options->skip, status_ctx->words_base) * hashes->salts_cnt; progress_skip = MIN (user_options->skip, status_ctx->words_base) * hashes->salts_cnt;
if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) progress_skip *= straight_ctx->kernel_rules_cnt; if (user_options->slow_candidates == true)
else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) progress_skip *= combinator_ctx->combs_cnt; {
else if (user_options_extra->attack_kern == ATTACK_KERN_BF) progress_skip *= mask_ctx->bfs_cnt; // nothing to do
}
else
{
if (user_options_extra->attack_kern == ATTACK_KERN_STRAIGHT) progress_skip *= straight_ctx->kernel_rules_cnt;
else if (user_options_extra->attack_kern == ATTACK_KERN_COMBI) progress_skip *= combinator_ctx->combs_cnt;
else if (user_options_extra->attack_kern == ATTACK_KERN_BF) progress_skip *= mask_ctx->bfs_cnt;
}
} }
return progress_skip; return progress_skip;