arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-07-01 04:12:44 +00:00
Code Issues Releases Wiki Activity

Resolve secondary conflict

Browse Source
This commit is contained in:
PenguinKeeper7 2023-10-06 10:35:37 +01:00
parent 2e36abe25a
commit 3ae0d235f4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/types.h
View File

@ -685,6 +685,7 @@ typedef enum user_options_defaults
OUTFILE_AUTOHEX = true, OUTFILE_AUTOHEX = true,
OUTFILE_CHECK_TIMER = 5, OUTFILE_CHECK_TIMER = 5,
OUTFILE_FORMAT = 3, OUTFILE_FORMAT = 3,
OUTFILE_JSON = false,
POTFILE_DISABLE = false, POTFILE_DISABLE = false,
PROGRESS_ONLY = false, PROGRESS_ONLY = false,
QUIET = false, QUIET = false,
@ -2108,6 +2109,7 @@ typedef struct outfile_ctx
u32 outfile_format; u32 outfile_format;
bool outfile_autohex; bool outfile_autohex;
bool outfile_json;
bool is_fifo; bool is_fifo;
char *filename; char *filename;
@ -2356,6 +2358,7 @@ typedef struct user_options
bool optimized_kernel_enable; bool optimized_kernel_enable;
bool multiply_accel_disable; bool multiply_accel_disable;
bool outfile_autohex; bool outfile_autohex;
bool outfile_json;
bool potfile_disable; bool potfile_disable;
bool progress_only; bool progress_only;
bool quiet; bool quiet;
@ -2776,6 +2779,8 @@ typedef struct status_ctx
u64 *words_progress_rejected; // progress number of words rejected per salt u64 *words_progress_rejected; // progress number of words rejected per salt
u64 *words_progress_restored; // progress number of words restored per salt u64 *words_progress_restored; // progress number of words restored per salt
int bypass_digests_done_new; // --bypass-threshold cracked counter
/** /**
* timer * timer
*/ */
@ -2791,12 +2796,6 @@ typedef struct status_ctx
double msec_paused; // timer on current dict double msec_paused; // timer on current dict
/**
* --bypass-threshold cracked counter
*/
int bypass_digests_done_new;
/** /**
* read timeouts * read timeouts
*/ */