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

Merge pull request #3067 from b0lek/master

Browse Source 
Added guess data into --status-json output to fix #3061
This commit is contained in:
Jens Steube 2021-12-21 19:30:34 +01:00 committed by GitHub
commit f1bcb6e059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@ -12,6 +12,7 @@
##
- Added support to use --debug-mode in attack-mode 9 (Association Attack)
- Added guess data to --status-json output
##
## Bugs
@ -20,6 +21,7 @@
- Fixed functional error when nonce-error-corrections that were set on the command line in hash-mode 22000/22001 were not accepted
- Fixed missing option flag OPTS_TYPE_SUGGEST_KG for hash-mode 11600 to inform the user about possible false positives in this mode
- Fixed undefined function call to hc_byte_perm_S() in hash-mode 17010 on non-CUDA compute devices
- Fixed HEX wordlist handling in -m 3000
##
## Technical

18
src/terminal.c
View File

@ -1309,6 +1309,24 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
target_json_encoded[j] = 0;
printf ("{ \"session\": \"%s\",", hashcat_status->session);
printf (" \"guess\": {");
if (hashcat_status->guess_base)
printf (" \"guess_base\": \"%s\",", hashcat_status->guess_base);
else
printf (" \"guess_base\": null,");
printf (" \"guess_base_count\": %d,", hashcat_status->guess_base_count);
printf (" \"guess_base_offset\": %d,", hashcat_status->guess_base_offset);
printf (" \"guess_base_percent\": %.02f,", hashcat_status->guess_base_percent);
printf (" \"guess_mask_length\": %d,", hashcat_status->guess_mask_length);
if (hashcat_status->guess_mod)
printf (" \"guess_mod\": \"%s\",", hashcat_status->guess_mod);
else
printf (" \"guess_mod\": null,");
printf (" \"guess_mod_count\": %d,", hashcat_status->guess_mod_count);
printf (" \"guess_mod_offset\": %d,", hashcat_status->guess_mod_offset);
printf (" \"guess_mod_percent\": %.02f,", hashcat_status->guess_mod_percent);
printf (" \"guess_mode\": %d", hashcat_status->guess_mode);
printf (" },");
printf (" \"status\": %d,", hashcat_status->status_number);
printf (" \"target\": \"%s\",", target_json_encoded);
printf (" \"progress\": [%" PRIu64 ", %" PRIu64 "],", hashcat_status->progress_cur_relative_skip, hashcat_status->progress_end_relative_skip);