arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-05-05 16:39:19 +00:00
Code Issues Releases Wiki Activity

Fixed formatting for speed and progress

Browse Source
This commit is contained in:
Chick3nman 2019-04-02 13:25:36 -05:00
parent ea141f43da
commit 4d60c7514a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/terminal.c
View File

@ -904,11 +904,11 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
} }
printf ("\{ \"session\": \"%s\",", hashcat_status->session); printf ("\{ \"session\": \"%s\",", hashcat_status->session);
printf (" \"status\": %d,", hashcat_status->status_number); printf (" \"status\": %d,", hashcat_status->status_number);
printf (" \"progress\": \[%," PRIu64 " %\]," PRIu64, hashcat_status->progress_cur_relative_skip, hashcat_status->progress_end_relative_skip); printf (" \"progress\": \[%" PRIu64 ", %" PRIu64 "\],", hashcat_status->progress_cur_relative_skip, hashcat_status->progress_end_relative_skip);
printf (" \"restore_point\": %," PRIu64, hashcat_status->restore_point); printf (" \"restore_point\": %," PRIu64, hashcat_status->restore_point);
printf (" \"recovered_hashes\": \[%d, %d\],", hashcat_status->digests_done, hashcat_status->digests_cnt); printf (" \"recovered_hashes\": \[%d, %d\],", hashcat_status->digests_done, hashcat_status->digests_cnt);
printf (" \"recovered_salts\": \[%d, %d\],", hashcat_status->salts_done, hashcat_status->salts_cnt); printf (" \"recovered_salts\": \[%d, %d\],", hashcat_status->salts_done, hashcat_status->salts_cnt);
printf (" \"rejected\": %," PRIu64, hashcat_status->progress_rejected); printf (" \"rejected\": %" PRIu64 ",", hashcat_status->progress_rejected);
printf (" \"devices\": \["); printf (" \"devices\": \[");
for (int device_id = 0; device_id < hashcat_status->device_info_cnt; device_id++) for (int device_id = 0; device_id < hashcat_status->device_info_cnt; device_id++)
{ {
@ -922,7 +922,7 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
printf(","); printf(",");
} }
printf (" \"device_id\": %d", device_id + 1); printf (" \"device_id\": %d", device_id + 1);
printf (" \"speed\": %," PRIu64, (u64) (device_info->hashes_msec_dev * 1000)); printf (" \"speed\": %" PRIu64 ",", (u64) (device_info->hashes_msec_dev * 1000));
if (hwmon_ctx->enabled == true) if (hwmon_ctx->enabled == true)
{ {