arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-25 07:58:19 +00:00
Code Issues Releases Wiki Activity

Add start and estimated end times, fix formatting

Browse Source
This commit is contained in:
Chick3nman 2019-04-02 14:55:05 -05:00
parent 7bbf4eb183
commit b551592082
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/terminal.c
View File

@ -892,6 +892,8 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
{ {
const hwmon_ctx_t *hwmon_ctx = hashcat_ctx->hwmon_ctx; const hwmon_ctx_t *hwmon_ctx = hashcat_ctx->hwmon_ctx;
const status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
hashcat_status_t *hashcat_status = (hashcat_status_t *) hcmalloc (sizeof (hashcat_status_t)); hashcat_status_t *hashcat_status = (hashcat_status_t *) hcmalloc (sizeof (hashcat_status_t));
const int rc_status = hashcat_get_status (hashcat_ctx, hashcat_status); const int rc_status = hashcat_get_status (hashcat_ctx, hashcat_status);
@ -902,8 +904,25 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
return; return;
} }
time_t time_now;
time (&time_now);
time_t sec_etc = status_get_sec_etc (hashcat_ctx);
if (overflow_check_u64_add (time_now, sec_etc) == false)
{
end = -1;
}
else
{
time_t end = time_now + sec_etc;
}
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 (" \"target\": \"%s\",", hashcat_status->hash_target);
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);
@ -935,9 +954,9 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
printf (" \"util\": %d \}", util); printf (" \"util\": %d \}", util);
} }
printf ("\]"); printf (" \]");
//printf ( the fucking time started) printf (" \"time_start\": %d,", status_ctx->runtime_start);
//printf ( the fucking time estimated) printf (" \"estimated_stop\": %d \}", end);
hc_fwrite (EOL, strlen (EOL), 1, stdout); hc_fwrite (EOL, strlen (EOL), 1, stdout);