From 3ae0d235f45e25e0531183f0ca4fbff77f4a775d Mon Sep 17 00:00:00 2001 From: PenguinKeeper7 Date: Fri, 6 Oct 2023 10:35:37 +0100 Subject: [PATCH] Resolve secondary conflict --- include/types.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/include/types.h b/include/types.h index 0c4b72f42..831246fa4 100644 --- a/include/types.h +++ b/include/types.h @@ -685,6 +685,7 @@ typedef enum user_options_defaults OUTFILE_AUTOHEX = true, OUTFILE_CHECK_TIMER = 5, OUTFILE_FORMAT = 3, + OUTFILE_JSON = false, POTFILE_DISABLE = false, PROGRESS_ONLY = false, QUIET = false, @@ -2108,6 +2109,7 @@ typedef struct outfile_ctx u32 outfile_format; bool outfile_autohex; + bool outfile_json; bool is_fifo; char *filename; @@ -2356,6 +2358,7 @@ typedef struct user_options bool optimized_kernel_enable; bool multiply_accel_disable; bool outfile_autohex; + bool outfile_json; bool potfile_disable; bool progress_only; bool quiet; @@ -2776,6 +2779,8 @@ typedef struct status_ctx u64 *words_progress_rejected; // progress number of words rejected per salt u64 *words_progress_restored; // progress number of words restored per salt + int bypass_digests_done_new; // --bypass-threshold cracked counter + /** * timer */ @@ -2791,12 +2796,6 @@ typedef struct status_ctx double msec_paused; // timer on current dict - /** - * --bypass-threshold cracked counter - */ - - int bypass_digests_done_new; - /** * read timeouts */