arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 08:08:10 +00:00
Code Issues Releases Wiki Activity

Restore: Restore timer is decreased from 60 seconds to 1 second, but only updates if there's actually a change compared to previous data written to restore file

Browse Source
This commit is contained in:
Jens Steube 2022-08-31 11:44:13 +02:00
parent 7b36d7ebf8
commit ea29cb5805
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -115,6 +115,7 @@
- OpenCL Runtime: Added support to use Apple Silicon compute devices - OpenCL Runtime: Added support to use Apple Silicon compute devices
- OpenCL Runtime: Add some unstable warnings detected on macOS - OpenCL Runtime: Add some unstable warnings detected on macOS
- OpenCL Runtime: Set default device-type to GPU with Apple Silicon compute devices - OpenCL Runtime: Set default device-type to GPU with Apple Silicon compute devices
- Restore: Restore timer is decreased from 60 seconds to 1 second, but only updates if there's actually a change compared to previous data written to restore file
- Rules: Add new rulesets from T0XlC: T0XlCv2, T0XlC_3_rule, T0XlC_insert_HTLM_entities_0_Z - Rules: Add new rulesets from T0XlC: T0XlCv2, T0XlC_3_rule, T0XlC_insert_HTLM_entities_0_Z
- Rules: Add support to include source wordlist in debugging format - Rules: Add support to include source wordlist in debugging format
- Rules: Update hand-written rulesets to covers years up to 2029 - Rules: Update hand-written rulesets to covers years up to 2029

6
include/types.h
View File

@ -679,7 +679,7 @@ typedef enum user_options_defaults
REMOVE_TIMER = 60, REMOVE_TIMER = 60,
RESTORE_DISABLE = false, RESTORE_DISABLE = false,
RESTORE = false, RESTORE = false,
RESTORE_TIMER = 60, RESTORE_TIMER = 1,
RP_GEN = 0, RP_GEN = 0,
RP_GEN_FUNC_MAX = 4, RP_GEN_FUNC_MAX = 4,
RP_GEN_FUNC_MIN = 1, RP_GEN_FUNC_MIN = 1,
@ -2183,6 +2183,10 @@ typedef struct restore_ctx
restore_data_t *rd; restore_data_t *rd;
u32 dicts_pos_prev;
u32 masks_pos_prev;
u64 words_cur_prev;
} restore_ctx_t; } restore_ctx_t;
typedef struct pidfile_ctx typedef struct pidfile_ctx

17
src/restore.c
View File

@ -240,6 +240,19 @@ int cycle_restore (hashcat_ctx_t *hashcat_ctx)
if (restore_ctx->enabled == false) return 0; if (restore_ctx->enabled == false) return 0;
const mask_ctx_t *mask_ctx = hashcat_ctx->mask_ctx;
const status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
const straight_ctx_t *straight_ctx = hashcat_ctx->straight_ctx;
// no updates, no need to write
if ((restore_ctx->masks_pos_prev == mask_ctx->masks_pos)
&& (restore_ctx->dicts_pos_prev == straight_ctx->dicts_pos)
&& (restore_ctx->words_cur_prev == status_ctx->words_cur)) return 0;
restore_ctx->masks_pos_prev = mask_ctx->masks_pos;
restore_ctx->dicts_pos_prev = straight_ctx->dicts_pos;
restore_ctx->words_cur_prev = status_ctx->words_cur;
const char *eff_restore_file = restore_ctx->eff_restore_file; const char *eff_restore_file = restore_ctx->eff_restore_file;
const char *new_restore_file = restore_ctx->new_restore_file; const char *new_restore_file = restore_ctx->new_restore_file;
@ -346,6 +359,10 @@ int restore_ctx_init (hashcat_ctx_t *hashcat_ctx, int argc, char **argv)
restore_ctx->restore_execute = true; restore_ctx->restore_execute = true;
} }
restore_ctx->masks_pos_prev = -1;
restore_ctx->dicts_pos_prev = -1;
restore_ctx->words_cur_prev = -1;
return 0; return 0;
} }