From 2f99ea8595cc8fa946be4652bce69b29757355e7 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Wed, 2 Jun 2021 19:43:44 +0200 Subject: [PATCH] Fixed error message in -a 9 mode with rules in case number of words from wordlist are not in sync with number of unique salts --- docs/changes.txt | 7 +++++++ src/straight.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index eac111351..72f460bb2 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -18,6 +18,12 @@ - Added hash-mode: sha384(utf16le($pass).$salt) - Added hash-mode: sha384($salt.utf16le($pass)) +## +## Bugs +## + +- Fixed error message in -a 9 mode with rules in case number of words from wordlist are not in sync with number of unique salts + ## ## Improvements ## @@ -31,6 +37,7 @@ - RC4 Kernels: Improved performance by 20%+ for hash-modes Kerberos 5 (etype 23), MS Office (<= 2003) and PDF (<= 1.6) by using new RC4 code - Status Screen: Show currently running kernel type (pure, optimized) and generator type (host, device) - UTF8-to-UTF16: Replaced naive UTF8 to UTF16 conversion with true conversion for RAR3, AES Crypt, MultiBit HD (scrypt) and Umbraco HMAC-SHA1 + ## ## Technical ## diff --git a/src/straight.c b/src/straight.c index 9b91ec30d..dfe71a668 100644 --- a/src/straight.c +++ b/src/straight.c @@ -236,7 +236,7 @@ int straight_ctx_update_loop (hashcat_ctx_t *hashcat_ctx) if ((status_ctx->words_cnt / straight_ctx->kernel_rules_cnt) != hashes->salts_cnt) { - event_log_error (hashcat_ctx, "Number of words in wordlist %s is not in sync with number of salts (words: %" PRIu64 ", salts: %d)", straight_ctx->dict, status_ctx->words_cnt, hashes->salts_cnt); + event_log_error (hashcat_ctx, "Number of words in wordlist %s is not in sync with number of salts (words: %" PRIu64 ", salts: %d)", straight_ctx->dict, status_ctx->words_cnt / straight_ctx->kernel_rules_cnt, hashes->salts_cnt); return -1; }