From 07f119c28b464907beb5e94ac3c44c3991821f13 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Wed, 14 Feb 2018 10:21:44 +0100 Subject: [PATCH] Fix -a 7 of fast hashes in optimized mode --- src/opencl.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/opencl.c b/src/opencl.c index 430331826..a3ff1638f 100644 --- a/src/opencl.c +++ b/src/opencl.c @@ -6231,15 +6231,23 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) device_param->kernel_params[ 4] = &device_param->d_tmps; device_param->kernel_params[ 5] = &device_param->d_hooks; - if (user_options->attack_mode == ATTACK_MODE_HYBRID2) + if (hashconfig->opti_type & OPTI_TYPE_OPTIMIZED_KERNEL) + { + // nothing to do + } + else { - device_param->kernel_params_mp[0] = (hashconfig->attack_exec == ATTACK_EXEC_INSIDE_KERNEL) - ? &device_param->d_pws_buf - : &device_param->d_pws_amp_buf; + if (user_options->attack_mode == ATTACK_MODE_HYBRID2) + { + device_param->kernel_params_mp[0] = (hashconfig->attack_exec == ATTACK_EXEC_INSIDE_KERNEL) + ? &device_param->d_pws_buf + : &device_param->d_pws_amp_buf; - CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->kernel_mp, 0, sizeof (cl_mem), device_param->kernel_params_mp[0]); if (CL_rc == -1) return -1; + CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->kernel_mp, 0, sizeof (cl_mem), device_param->kernel_params_mp[0]); if (CL_rc == -1) return -1; + } } - else if (user_options->attack_mode == ATTACK_MODE_BF) + + if (user_options->attack_mode == ATTACK_MODE_BF) { device_param->kernel_params_mp_l[0] = (hashconfig->attack_exec == ATTACK_EXEC_INSIDE_KERNEL) ? &device_param->d_pws_buf