arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-13 17:21:10 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2646 from Slattz/master

Browse Source 
Fix --keep-guessing mode
This commit is contained in:
Jens Steube 2021-04-28 10:23:29 +02:00 committed by GitHub
commit 96df73dee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hashes.c
View File

@ -533,6 +533,9 @@ int check_cracked (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (hashes->digests_shown[hash_pos] == 1) continue; if (hashes->digests_shown[hash_pos] == 1) continue;
const u32 salt_pos = cracked[i].salt_pos;
salt_t *salt_buf = &hashes->salts_buf[salt_pos];
if ((hashconfig->opts_type & OPTS_TYPE_PT_NEVERCRACK) == 0) if ((hashconfig->opts_type & OPTS_TYPE_PT_NEVERCRACK) == 0)
{ {
hashes->digests_shown[hash_pos] = 1; hashes->digests_shown[hash_pos] = 1;
@ -541,10 +544,6 @@ int check_cracked (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
cpt_cracked++; cpt_cracked++;
const u32 salt_pos = cracked[i].salt_pos;
salt_t *salt_buf = &hashes->salts_buf[salt_pos];
salt_buf->digests_done++; salt_buf->digests_done++;
if (salt_buf->digests_done == salt_buf->digests_cnt) if (salt_buf->digests_done == salt_buf->digests_cnt)
@ -553,7 +552,14 @@ int check_cracked (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
hashes->salts_done++; hashes->salts_done++;
} }
}
if (hashes->salts_done == hashes->salts_cnt) mycracked (hashcat_ctx);
check_hash (hashcat_ctx, device_param, &cracked[i]);
if (hashconfig->opts_type & OPTS_TYPE_PT_NEVERCRACK)
{
// we need to reset cracked state on the device // we need to reset cracked state on the device
// otherwise host thinks again and again the hash was cracked // otherwise host thinks again and again the hash was cracked
// and returns invalid password each time // and returns invalid password each time
@ -574,10 +580,6 @@ int check_cracked (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (CL_rc == -1) return -1; if (CL_rc == -1) return -1;
} }
} }
if (hashes->salts_done == hashes->salts_cnt) mycracked (hashcat_ctx);
check_hash (hashcat_ctx, device_param, &cracked[i]);
} }
hc_thread_mutex_unlock (status_ctx->mux_display); hc_thread_mutex_unlock (status_ctx->mux_display);