arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-15 20:39:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #211 from gm4tr1x/issue150

Browse Source 
Fixed "VENDOR_ID" format (probably relate with issue #150)
This commit is contained in:
Jens Steube 2016-02-06 22:08:34 +01:00
commit 952c20e0f8
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/oclHashcat.c
View File

@ -13213,12 +13213,12 @@ int main (int argc, char **argv)
*/ */
#ifdef HAVE_HWMON #ifdef HAVE_HWMON
int *temp_retain_fanspeed_value = (int *) mycalloc (devices_cnt, sizeof (int)); int *temp_retain_fanspeed_value = (int *) mycalloc (data.devices_cnt, sizeof (int));
#ifdef HAVE_ADL #ifdef HAVE_ADL
ADLOD6MemClockState *od_clock_mem_status = (ADLOD6MemClockState *) mycalloc (devices_cnt, sizeof (ADLOD6MemClockState)); ADLOD6MemClockState *od_clock_mem_status = (ADLOD6MemClockState *) mycalloc (data.devices_cnt, sizeof (ADLOD6MemClockState));
int *od_power_control_status = (int *) mycalloc (devices_cnt, sizeof (int)); int *od_power_control_status = (int *) mycalloc (data.devices_cnt, sizeof (int));
#endif // ADL #endif // ADL
#endif #endif
@ -13326,7 +13326,7 @@ int main (int argc, char **argv)
if (gpu_temp_disable == 0) if (gpu_temp_disable == 0)
{ {
for (uint device_id = 0; device_id < devices_cnt; device_id++) for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
{ {
hc_device_param_t *device_param = &data.devices_param[device_id]; hc_device_param_t *device_param = &data.devices_param[device_id];
@ -13365,7 +13365,7 @@ int main (int argc, char **argv)
{ {
hc_thread_mutex_lock (mux_adl); hc_thread_mutex_lock (mux_adl);
for (uint device_id = 0; device_id < devices_cnt; device_id++) for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
{ {
hc_device_param_t *device_param = &data.devices_param[device_id]; hc_device_param_t *device_param = &data.devices_param[device_id];
@ -13434,7 +13434,7 @@ int main (int argc, char **argv)
uint kernel_blocks_all = 0; uint kernel_blocks_all = 0;
for (uint device_id = 0; device_id < devices_cnt; device_id++) for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
{ {
/** /**
* host buffer * host buffer
@ -13716,7 +13716,7 @@ int main (int argc, char **argv)
// we don't have sm_* on vendors not NV but it doesn't matter // we don't have sm_* on vendors not NV but it doesn't matter
snprintf (build_opts, sizeof (build_opts) - 1, "-I%s/ -DVENDOR_ID=%d -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u", shared_dir, device_param->vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type); snprintf (build_opts, sizeof (build_opts) - 1, "-I%s/ -DVENDOR_ID=%u -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u", shared_dir, device_param->vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type);
/** /**
* main kernel * main kernel
@ -15408,7 +15408,7 @@ int main (int argc, char **argv)
{ {
hc_device_param_t *device_param = NULL; hc_device_param_t *device_param = NULL;
for (uint device_id = 0; device_id < devices_cnt; device_id++) for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
{ {
device_param = &data.devices_param[device_id]; device_param = &data.devices_param[device_id];
@ -15647,7 +15647,7 @@ int main (int argc, char **argv)
// args // args
for (uint device_id = 0; device_id < devices_cnt; device_id++) for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
{ {
hc_device_param_t *device_param = &data.devices_param[device_id]; hc_device_param_t *device_param = &data.devices_param[device_id];
@ -16156,7 +16156,7 @@ int main (int argc, char **argv)
data.bfs_cnt = sp_get_sum (0, css_cnt_r, root_css_buf); data.bfs_cnt = sp_get_sum (0, css_cnt_r, root_css_buf);
for (uint device_id = 0; device_id < devices_cnt; device_id++) for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
{ {
hc_device_param_t *device_param = &data.devices_param[device_id]; hc_device_param_t *device_param = &data.devices_param[device_id];
@ -16357,9 +16357,9 @@ int main (int argc, char **argv)
* create cracker threads * create cracker threads
*/ */
hc_thread_t *c_threads = (hc_thread_t *) mycalloc (devices_cnt, sizeof (hc_thread_t)); hc_thread_t *c_threads = (hc_thread_t *) mycalloc (data.devices_cnt, sizeof (hc_thread_t));
for (uint device_id = 0; device_id < devices_cnt; device_id++) for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
{ {
hc_device_param_t *device_param = &devices_param[device_id]; hc_device_param_t *device_param = &devices_param[device_id];
@ -16375,7 +16375,7 @@ int main (int argc, char **argv)
// wait for crack threads to exit // wait for crack threads to exit
hc_thread_wait (devices_cnt, c_threads); hc_thread_wait (data.devices_cnt, c_threads);
local_free (c_threads); local_free (c_threads);
@ -16598,7 +16598,7 @@ int main (int argc, char **argv)
if (quiet == 0) log_info (""); if (quiet == 0) log_info ("");
} }
for (uint device_id = 0; device_id < devices_cnt; device_id++) for (uint device_id = 0; device_id < data.devices_cnt; device_id++)
{ {
hc_device_param_t *device_param = &data.devices_param[device_id]; hc_device_param_t *device_param = &data.devices_param[device_id];