|
|
@ -3685,11 +3685,12 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
hashconfig->tmp_size = scrypt_tmp_size;
|
|
|
|
hashconfig->tmp_size = scrypt_tmp_size;
|
|
|
|
|
|
|
|
|
|
|
|
u32 tmto_start = 0;
|
|
|
|
u32 tmto_start = 0;
|
|
|
|
u32 tmto_stop = 10;
|
|
|
|
u32 tmto_stop = 5;
|
|
|
|
|
|
|
|
|
|
|
|
if (user_options->scrypt_tmto)
|
|
|
|
if (user_options->scrypt_tmto)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
tmto_start = user_options->scrypt_tmto;
|
|
|
|
tmto_start = user_options->scrypt_tmto;
|
|
|
|
|
|
|
|
tmto_stop = user_options->scrypt_tmto;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -3718,17 +3719,6 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
tmto_start = 4;
|
|
|
|
tmto_start = 4;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (hashconfig->hash_mode == 15700)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (device_param->device_vendor_id == VENDOR_ID_AMD)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
tmto_start = 5;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (device_param->device_vendor_id == VENDOR_ID_NV)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
tmto_start = 6;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const u32 kernel_power_max = device_param->hardware_power * device_param->kernel_accel_max;
|
|
|
|
const u32 kernel_power_max = device_param->hardware_power * device_param->kernel_accel_max;
|
|
|
@ -3772,9 +3762,11 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
+ size_tm
|
|
|
|
+ size_tm
|
|
|
|
+ size_tmps;
|
|
|
|
+ size_tmps;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool not_enough_memory = true;
|
|
|
|
|
|
|
|
|
|
|
|
u32 tmto;
|
|
|
|
u32 tmto;
|
|
|
|
|
|
|
|
|
|
|
|
for (tmto = tmto_start; tmto < tmto_stop; tmto++)
|
|
|
|
for (tmto = tmto_start; tmto <= tmto_stop; tmto++)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
size_scrypt = (128 * scrypt_r) * scrypt_N;
|
|
|
|
size_scrypt = (128 * scrypt_r) * scrypt_N;
|
|
|
|
|
|
|
|
|
|
|
@ -3801,10 +3793,12 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx)
|
|
|
|
scrypt_tmto_final = tmto;
|
|
|
|
scrypt_tmto_final = tmto;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
not_enough_memory = false;
|
|
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (tmto == tmto_stop)
|
|
|
|
if (not_enough_memory == true)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
event_log_error (hashcat_ctx, "Cannot allocate enough device memory.");
|
|
|
|
event_log_error (hashcat_ctx, "Cannot allocate enough device memory.");
|
|
|
|
|
|
|
|
|
|
|
|