projects
/
hashcat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
730044e
)
HMS fix: only copy the ADL adapter info for GPU devices, for CPU devices we leave...
author
philsmd
<philsmd@hashcat.net>
Tue, 12 Jan 2016 00:21:11 +0000
(
01:21
+0100)
committer
philsmd
<philsmd@hashcat.net>
Tue, 12 Jan 2016 00:21:11 +0000
(
01:21
+0100)
src/oclHashcat.c
patch
|
blob
|
history
diff --git
a/src/oclHashcat.c
b/src/oclHashcat.c
index
66efe07
..
bd525c9
100644
(file)
--- a/
src/oclHashcat.c
+++ b/
src/oclHashcat.c
@@
-12704,21
+12704,14
@@
int main (int argc, char **argv)
// copy hm_adapter info to data.hm_device[]
// copy hm_adapter info to data.hm_device[]
- uint hm_adapter_cur = hm_adapter_index;
-
- if ((device_type & CL_DEVICE_TYPE_GPU) == 0)
- {
- // assign a CPU adapter (i.e. not initialized hm_adapter_all[] entry)
-
- hm_adapter_cur = devices_all_cnt - 1;
- }
-
- memcpy (&data.hm_device[device_id], &hm_adapter_all[hm_adapter_cur], sizeof (hm_attrs_t));
-
if (device_type & CL_DEVICE_TYPE_GPU)
{
if (device_type & CL_DEVICE_TYPE_GPU)
{
+ memcpy (&data.hm_device[device_id], &hm_adapter_all[hm_adapter_index], sizeof (hm_attrs_t));
+
hm_adapter_index++;
}
hm_adapter_index++;
}
+ // this would be the CPU case (but it should be zeroed out already):
+ // else memset (&data.hm_device[device_id], 0, sizeof (hm_attrs_t));
devices_cnt++;
}
devices_cnt++;
}