github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2024-11-28 05:21:38 +01:00
Code Releases Activity

Support pause/abort in hooks

Browse Source
This commit is contained in:
Jens Steube 2019-11-15 14:42:34 +01:00
parent 08a74596c1
commit fe8c17f4c7
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types.h
View File

@ -2476,6 +2476,7 @@ typedef struct hook_thread_param
int tsz;
module_ctx_t *module_ctx;
status_ctx_t *status_ctx;
hc_device_param_t *device_param;

18
src/backend.c
View File

@ -2891,6 +2891,7 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
hook_thread_param->tsz = hook_threads;
hook_thread_param->module_ctx = module_ctx;
hook_thread_param->status_ctx = status_ctx;
hook_thread_param->device_param = device_param;
@ -3006,6 +3007,7 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
hook_thread_param->tsz = hook_threads;
hook_thread_param->module_ctx = module_ctx;
hook_thread_param->status_ctx = status_ctx;
hook_thread_param->device_param = device_param;
@ -10269,6 +10271,7 @@ void *hook12_thread (void *p)
hook_thread_param_t *hook_thread_param = (hook_thread_param_t *) p;
module_ctx_t *module_ctx = hook_thread_param->module_ctx;
status_ctx_t *status_ctx = hook_thread_param->status_ctx;
const u64 tid = hook_thread_param->tid;
const u64 tsz = hook_thread_param->tsz;
@ -10276,7 +10279,12 @@ void *hook12_thread (void *p)
for (u64 pw_pos = tid; pw_pos < pws_cnt; pw_pos += tsz)
{
module_ctx->module_hook12 (hook_thread_param->device_param, hook_thread_param->hook_salts_buf, hook_thread_param->salt_pos, pw_pos);
while (status_ctx->devices_status == STATUS_PAUSED) sleep (1);
if (status_ctx->devices_status == STATUS_RUNNING)
{
module_ctx->module_hook12 (hook_thread_param->device_param, hook_thread_param->hook_salts_buf, hook_thread_param->salt_pos, pw_pos);
}
}
return NULL;
@ -10287,6 +10295,7 @@ void *hook23_thread (void *p)
hook_thread_param_t *hook_thread_param = (hook_thread_param_t *) p;
module_ctx_t *module_ctx = hook_thread_param->module_ctx;
status_ctx_t *status_ctx = hook_thread_param->status_ctx;
const u64 tid = hook_thread_param->tid;
const u64 tsz = hook_thread_param->tsz;
@ -10294,7 +10303,12 @@ void *hook23_thread (void *p)
for (u64 pw_pos = tid; pw_pos < pws_cnt; pw_pos += tsz)
{
module_ctx->module_hook23 (hook_thread_param->device_param, hook_thread_param->hook_salts_buf, hook_thread_param->salt_pos, pw_pos);
while (status_ctx->devices_status == STATUS_PAUSED) sleep (1);
if (status_ctx->devices_status == STATUS_RUNNING)
{
module_ctx->module_hook23 (hook_thread_param->device_param, hook_thread_param->hook_salts_buf, hook_thread_param->salt_pos, pw_pos);
}
}
return NULL;