1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-08-05 05:15:20 +00:00

Merge pull request #4185 from matrix/deep_comp_aux_workaround

workaround for issue #3914
This commit is contained in:
Jens Steube 2025-05-25 08:14:23 +02:00 committed by GitHub
commit f9822fe569
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1462,11 +1462,15 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
device_param->kernel_param.loop_pos = loops_pos; device_param->kernel_param.loop_pos = loops_pos;
device_param->kernel_param.loop_cnt = loops_cnt; device_param->kernel_param.loop_cnt = loops_cnt;
int aux_cnt = 0;
if (hashconfig->opts_type & OPTS_TYPE_AUX1) if (hashconfig->opts_type & OPTS_TYPE_AUX1)
{ {
if (run_kernel (hashcat_ctx, device_param, KERN_RUN_AUX1, pws_pos, pws_cnt, false, 0) == -1) return -1; if (run_kernel (hashcat_ctx, device_param, KERN_RUN_AUX1, pws_pos, pws_cnt, false, 0) == -1) return -1;
if (status_ctx->run_thread_level2 == false) break; if (status_ctx->run_thread_level2 == false) break;
aux_cnt++;
} }
if (hashconfig->opts_type & OPTS_TYPE_AUX2) if (hashconfig->opts_type & OPTS_TYPE_AUX2)
@ -1474,6 +1478,8 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
if (run_kernel (hashcat_ctx, device_param, KERN_RUN_AUX2, pws_pos, pws_cnt, false, 0) == -1) return -1; if (run_kernel (hashcat_ctx, device_param, KERN_RUN_AUX2, pws_pos, pws_cnt, false, 0) == -1) return -1;
if (status_ctx->run_thread_level2 == false) break; if (status_ctx->run_thread_level2 == false) break;
aux_cnt++;
} }
if (hashconfig->opts_type & OPTS_TYPE_AUX3) if (hashconfig->opts_type & OPTS_TYPE_AUX3)
@ -1481,6 +1487,8 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
if (run_kernel (hashcat_ctx, device_param, KERN_RUN_AUX3, pws_pos, pws_cnt, false, 0) == -1) return -1; if (run_kernel (hashcat_ctx, device_param, KERN_RUN_AUX3, pws_pos, pws_cnt, false, 0) == -1) return -1;
if (status_ctx->run_thread_level2 == false) break; if (status_ctx->run_thread_level2 == false) break;
aux_cnt++;
} }
if (hashconfig->opts_type & OPTS_TYPE_AUX4) if (hashconfig->opts_type & OPTS_TYPE_AUX4)
@ -1488,6 +1496,15 @@ int choose_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param,
if (run_kernel (hashcat_ctx, device_param, KERN_RUN_AUX4, pws_pos, pws_cnt, false, 0) == -1) return -1; if (run_kernel (hashcat_ctx, device_param, KERN_RUN_AUX4, pws_pos, pws_cnt, false, 0) == -1) return -1;
if (status_ctx->run_thread_level2 == false) break; if (status_ctx->run_thread_level2 == false) break;
aux_cnt++;
}
if (aux_cnt == 0)
{
if (run_kernel (hashcat_ctx, device_param, KERN_RUN_3, pws_pos, pws_cnt, false, 0) == -1) return -1;
if (status_ctx->run_thread_level2 == false) break;
} }
} }
} }