diff --git a/include/types.h b/include/types.h index 55aab8dc0..0c4b72f42 100644 --- a/include/types.h +++ b/include/types.h @@ -748,102 +748,103 @@ typedef enum user_options_map IDX_BRAIN_SESSION = 0xff0f, IDX_BRAIN_SESSION_WHITELIST = 0xff10, #endif - IDX_CPU_AFFINITY = 0xff11, + IDX_BYPASS_THRESHOLD = 0xff11, + IDX_BYPASS_DELAY = 0xff12, + IDX_CPU_AFFINITY = 0xff13, IDX_CUSTOM_CHARSET_1 = '1', IDX_CUSTOM_CHARSET_2 = '2', IDX_CUSTOM_CHARSET_3 = '3', IDX_CUSTOM_CHARSET_4 = '4', - IDX_DEBUG_FILE = 0xff12, - IDX_DEBUG_MODE = 0xff13, - IDX_DEPRECATED_CHECK_DISABLE = 0xff14, - IDX_ENCODING_FROM = 0xff15, - IDX_ENCODING_TO = 0xff16, - IDX_HASH_INFO = 0xff17, - IDX_FORCE = 0xff18, - IDX_HWMON_DISABLE = 0xff19, - IDX_HWMON_TEMP_ABORT = 0xff1a, + IDX_DEBUG_FILE = 0xff14, + IDX_DEBUG_MODE = 0xff15, + IDX_DEPRECATED_CHECK_DISABLE = 0xff16, + IDX_ENCODING_FROM = 0xff17, + IDX_ENCODING_TO = 0xff18, + IDX_HASH_INFO = 0xff19, + IDX_FORCE = 0xff1a, + IDX_HWMON_DISABLE = 0xff1b, + IDX_HWMON_TEMP_ABORT = 0xff1c, IDX_HASH_MODE = 'm', - IDX_HCCAPX_MESSAGE_PAIR = 0xff1b, + IDX_HCCAPX_MESSAGE_PAIR = 0xff1d, IDX_HELP = 'h', - IDX_HEX_CHARSET = 0xff1c, - IDX_HEX_SALT = 0xff1d, - IDX_HEX_WORDLIST = 0xff1e, - IDX_HOOK_THREADS = 0xff1f, - IDX_IDENTIFY = 0xff20, + IDX_HEX_CHARSET = 0xff1e, + IDX_HEX_SALT = 0xff1f, + IDX_HEX_WORDLIST = 0xff20, + IDX_HOOK_THREADS = 0xff21, + IDX_IDENTIFY = 0xff22, IDX_INCREMENT = 'i', - IDX_INCREMENT_MAX = 0xff21, - IDX_INCREMENT_MIN = 0xff22, - IDX_INDUCTION_DIR = 0xff23, - IDX_KEEP_GUESSING = 0xff24, + IDX_INCREMENT_MAX = 0xff23, + IDX_INCREMENT_MIN = 0xff24, + IDX_INDUCTION_DIR = 0xff25, + IDX_KEEP_GUESSING = 0xff26, IDX_KERNEL_ACCEL = 'n', IDX_KERNEL_LOOPS = 'u', IDX_KERNEL_THREADS = 'T', - IDX_KEYBOARD_LAYOUT_MAPPING = 0xff25, - IDX_KEYSPACE = 0xff26, - IDX_LEFT = 0xff27, + IDX_KEYBOARD_LAYOUT_MAPPING = 0xff27, + IDX_KEYSPACE = 0xff28, + IDX_LEFT = 0xff29, IDX_LIMIT = 'l', - IDX_LOGFILE_DISABLE = 0xff28, - IDX_LOOPBACK = 0xff29, - IDX_MACHINE_READABLE = 0xff2a, - IDX_MARKOV_CLASSIC = 0xff2b, - IDX_MARKOV_DISABLE = 0xff2c, - IDX_MARKOV_HCSTAT2 = 0xff2d, - IDX_MARKOV_INVERSE = 0xff2e, + IDX_LOGFILE_DISABLE = 0xff2a, + IDX_LOOPBACK = 0xff2b, + IDX_MACHINE_READABLE = 0xff2c, + IDX_MARKOV_CLASSIC = 0xff2d, + IDX_MARKOV_DISABLE = 0xff2e, + IDX_MARKOV_HCSTAT2 = 0xff2f, + IDX_MARKOV_INVERSE = 0xff30, IDX_MARKOV_THRESHOLD = 't', - IDX_METAL_COMPILER_RUNTIME = 0xff2f, - IDX_NONCE_ERROR_CORRECTIONS = 0xff30, + IDX_METAL_COMPILER_RUNTIME = 0xff31, + IDX_NONCE_ERROR_CORRECTIONS = 0xff32, IDX_OPENCL_DEVICE_TYPES = 'D', IDX_OPTIMIZED_KERNEL_ENABLE = 'O', IDX_MULTIPLY_ACCEL_DISABLE = 'M', - IDX_OUTFILE_AUTOHEX_DISABLE = 0xff31, - IDX_OUTFILE_CHECK_DIR = 0xff32, - IDX_OUTFILE_CHECK_TIMER = 0xff33, - IDX_OUTFILE_FORMAT = 0xff34, + IDX_OUTFILE_AUTOHEX_DISABLE = 0xff33, + IDX_OUTFILE_CHECK_DIR = 0xff34, + IDX_OUTFILE_CHECK_TIMER = 0xff35, + IDX_OUTFILE_FORMAT = 0xff36, + IDX_OUTFILE_JSON = 0xff37, IDX_OUTFILE = 'o', - IDX_POTFILE_DISABLE = 0xff35, - IDX_POTFILE_PATH = 0xff36, - IDX_PROGRESS_ONLY = 0xff37, - IDX_QUIET = 0xff38, - IDX_REMOVE = 0xff39, - IDX_REMOVE_TIMER = 0xff3a, - IDX_RESTORE = 0xff3b, - IDX_RESTORE_DISABLE = 0xff3c, - IDX_RESTORE_FILE_PATH = 0xff3d, + IDX_POTFILE_DISABLE = 0xff38, + IDX_POTFILE_PATH = 0xff39, + IDX_PROGRESS_ONLY = 0xff3a, + IDX_QUIET = 0xff3b, + IDX_REMOVE = 0xff3c, + IDX_REMOVE_TIMER = 0xff3d, + IDX_RESTORE = 0xff3e, + IDX_RESTORE_DISABLE = 0xff3f, + IDX_RESTORE_FILE_PATH = 0xff40, IDX_RP_FILE = 'r', - IDX_RP_GEN_FUNC_MAX = 0xff3e, - IDX_RP_GEN_FUNC_MIN = 0xff3f, - IDX_RP_GEN_FUNC_SEL = 0xff40, + IDX_RP_GEN_FUNC_MAX = 0xff41, + IDX_RP_GEN_FUNC_MIN = 0xff42, + IDX_RP_GEN_FUNC_SEL = 0xff43, IDX_RP_GEN = 'g', - IDX_RP_GEN_SEED = 0xff41, + IDX_RP_GEN_SEED = 0xff44, IDX_RULE_BUF_L = 'j', IDX_RULE_BUF_R = 'k', - IDX_RUNTIME = 0xff42, - IDX_SCRYPT_TMTO = 0xff43, + IDX_RUNTIME = 0xff45, + IDX_SCRYPT_TMTO = 0xff46, IDX_SEGMENT_SIZE = 'c', - IDX_SELF_TEST_DISABLE = 0xff44, + IDX_SELF_TEST_DISABLE = 0xff47, IDX_SEPARATOR = 'p', - IDX_SESSION = 0xff45, - IDX_SHOW = 0xff46, + IDX_SESSION = 0xff48, + IDX_SHOW = 0xff49, IDX_SKIP = 's', IDX_SLOW_CANDIDATES = 'S', - IDX_SPEED_ONLY = 0xff47, - IDX_SPIN_DAMP = 0xff48, - IDX_STATUS = 0xff49, - IDX_STATUS_JSON = 0xff4a, - IDX_STATUS_TIMER = 0xff4b, - IDX_STDOUT_FLAG = 0xff4c, - IDX_STDIN_TIMEOUT_ABORT = 0xff4d, - IDX_TRUECRYPT_KEYFILES = 0xff4e, - IDX_USERNAME = 0xff4f, - IDX_VERACRYPT_KEYFILES = 0xff50, - IDX_VERACRYPT_PIM_START = 0xff51, - IDX_VERACRYPT_PIM_STOP = 0xff52, + IDX_SPEED_ONLY = 0xff4a, + IDX_SPIN_DAMP = 0xff4b, + IDX_STATUS = 0xff4c, + IDX_STATUS_JSON = 0xff4d, + IDX_STATUS_TIMER = 0xff4e, + IDX_STDOUT_FLAG = 0xff4f, + IDX_STDIN_TIMEOUT_ABORT = 0xff50, + IDX_TRUECRYPT_KEYFILES = 0xff51, + IDX_USERNAME = 0xff52, + IDX_VERACRYPT_KEYFILES = 0xff53, + IDX_VERACRYPT_PIM_START = 0xff54, + IDX_VERACRYPT_PIM_STOP = 0xff55, IDX_VERSION_LOWER = 'v', IDX_VERSION = 'V', - IDX_WORDLIST_AUTOHEX_DISABLE = 0xff53, + IDX_WORDLIST_AUTOHEX_DISABLE = 0xff56, IDX_WORKLOAD_PROFILE = 'w', - IDX_BYPASS_THRESHOLD = 0xff54, - IDX_BYPASS_DELAY = 0xff55, } user_options_map_t; @@ -2794,7 +2795,7 @@ typedef struct status_ctx * --bypass-threshold cracked counter */ - int bypass_digests_done; + int bypass_digests_done_new; /** * read timeouts diff --git a/src/hashcat.c b/src/hashcat.c index b0e4811f0..dd4d27259 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -301,7 +301,7 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx) if (user_options->bypass_delay_chgd == true) { time (&status_ctx->timer_bypass_start); - status_ctx->bypass_digests_done = hashcat_ctx->hashes->digests_done; + status_ctx->bypass_digests_done_new = hashcat_ctx->hashes->digests_done_new; } /** diff --git a/src/monitor.c b/src/monitor.c index d15a2ecf7..901175665 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -331,6 +331,7 @@ static int monitor (hashcat_ctx_t *hashcat_ctx) if(user_options->bypass_delay_chgd == true) { time (&status_ctx->timer_bypass_cur); + printf("%d %d %d %d %d %d\n", status_ctx->timer_bypass_start, status_ctx->timer_bypass_cur, status_ctx->bypass_digests_done_new, hashcat_ctx->hashes->digests_done_new, (status_ctx->timer_bypass_cur - status_ctx->timer_bypass_start), (hashcat_ctx->hashes->digests_done_new - status_ctx->bypass_digests_done_new)); if(status_ctx->devices_status == STATUS_RUNNING) { @@ -340,7 +341,7 @@ static int monitor (hashcat_ctx_t *hashcat_ctx) time (&status_ctx->timer_bypass_start); // --bypass-threshold check - if((u32)(hashcat_ctx->hashes->digests_done - status_ctx->bypass_digests_done) < user_options->bypass_threshold) + if((u32)(hashcat_ctx->hashes->digests_done_new - status_ctx->bypass_digests_done_new) < user_options->bypass_threshold) { event_log_info (hashcat_ctx, NULL); event_log_info (hashcat_ctx, NULL); @@ -350,12 +351,12 @@ static int monitor (hashcat_ctx_t *hashcat_ctx) event_log_info (hashcat_ctx, "Bypass threshold reached! Next dictionary / mask in queue selected. Bypassing current one."); event_log_info (hashcat_ctx, NULL); - status_ctx->bypass_digests_done = 0; + status_ctx->bypass_digests_done_new = 0; } else { // enough recovered to continue the session - status_ctx->bypass_digests_done = hashcat_ctx->hashes->digests_done; + status_ctx->bypass_digests_done_new = hashcat_ctx->hashes->digests_done_new; } } }