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

Generate a more easy to read filename for cached kernels

Browse Source
This commit is contained in:
jsteube 2016-01-04 20:56:15 +01:00
parent 8baf705f6a
commit 894140b816
4 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/cpu-md5.h Normal file
View File

@ -0,0 +1,2 @@
void md5_64 (uint block[16], uint digest[4]);

1
include/shared.h
View File

@ -2293,6 +2293,7 @@ void *thread_runtime (void *p);
*/ */
#include "cpu-crc32.h" #include "cpu-crc32.h"
#include "cpu-md5.h"
/** /**
* ciphers for use on cpu * ciphers for use on cpu

1
include/types.h
View File

@ -875,6 +875,7 @@ struct __hc_device_param
// device specific attributes starting // device specific attributes starting
char *device_name; char *device_name;
char *device_name_chksum;
char *device_version; char *device_version;
char *driver_version; char *driver_version;

49
src/oclHashcat.c
View File

@ -1609,20 +1609,20 @@ static void generate_source_kernel_filename (const uint attack_exec, const uint
snprintf (source_file, 255, "%s/OpenCL/m%05d.cl", shared_dir, (int) kern_type); snprintf (source_file, 255, "%s/OpenCL/m%05d.cl", shared_dir, (int) kern_type);
} }
static void generate_cached_kernel_filename (const uint attack_exec, const uint attack_kern, const uint kern_type, char *profile_dir, char *device_name, char *device_version, char *driver_version, int vendor_id, char *cached_file) static void generate_cached_kernel_filename (const uint attack_exec, const uint attack_kern, const uint kern_type, char *profile_dir, char *device_name_chksum, int vendor_id, char *cached_file)
{ {
if (attack_exec == ATTACK_EXEC_ON_GPU) if (attack_exec == ATTACK_EXEC_ON_GPU)
{ {
if (attack_kern == ATTACK_KERN_STRAIGHT) if (attack_kern == ATTACK_KERN_STRAIGHT)
snprintf (cached_file, 255, "%s/kernels/%d/m%05d_a0.%s_%s_%s_%d.kernel", profile_dir, vendor_id, (int) kern_type, device_name, device_version, driver_version, COMPTIME); snprintf (cached_file, 255, "%s/kernels/%d/m%05d_a0.%s.kernel", profile_dir, vendor_id, (int) kern_type, device_name_chksum);
else if (attack_kern == ATTACK_KERN_COMBI) else if (attack_kern == ATTACK_KERN_COMBI)
snprintf (cached_file, 255, "%s/kernels/%d/m%05d_a1.%s_%s_%s_%d.kernel", profile_dir, vendor_id, (int) kern_type, device_name, device_version, driver_version, COMPTIME); snprintf (cached_file, 255, "%s/kernels/%d/m%05d_a1.%s.kernel", profile_dir, vendor_id, (int) kern_type, device_name_chksum);
else if (attack_kern == ATTACK_KERN_BF) else if (attack_kern == ATTACK_KERN_BF)
snprintf (cached_file, 255, "%s/kernels/%d/m%05d_a3.%s_%s_%s_%d.kernel", profile_dir, vendor_id, (int) kern_type, device_name, device_version, driver_version, COMPTIME); snprintf (cached_file, 255, "%s/kernels/%d/m%05d_a3.%s.kernel", profile_dir, vendor_id, (int) kern_type, device_name_chksum);
} }
else else
{ {
snprintf (cached_file, 255, "%s/kernels/%d/m%05d.%s_%s_%s_%d.kernel", profile_dir, vendor_id, (int) kern_type, device_name, device_version, driver_version, COMPTIME); snprintf (cached_file, 255, "%s/kernels/%d/m%05d.%s.kernel", profile_dir, vendor_id, (int) kern_type, device_name_chksum);
} }
} }
@ -1638,15 +1638,15 @@ static void generate_source_kernel_mp_filename (const uint opti_type, const uint
} }
} }
static void generate_cached_kernel_mp_filename (const uint opti_type, const uint opts_type, char *profile_dir, char *device_name, char *device_version, char *driver_version, int vendor_id, char *cached_file) static void generate_cached_kernel_mp_filename (const uint opti_type, const uint opts_type, char *profile_dir, char *device_name_chksum, int vendor_id, char *cached_file)
{ {
if ((opti_type & OPTI_TYPE_BRUTE_FORCE) && (opts_type & OPTS_TYPE_PT_GENERATE_BE)) if ((opti_type & OPTI_TYPE_BRUTE_FORCE) && (opts_type & OPTS_TYPE_PT_GENERATE_BE))
{ {
snprintf (cached_file, 255, "%s/kernels/%d/markov_be.%s_%s_%s_%d.kernel", profile_dir, vendor_id, device_name, device_version, driver_version, COMPTIME); snprintf (cached_file, 255, "%s/kernels/%d/markov_be.%s.kernel", profile_dir, vendor_id, device_name_chksum);
} }
else else
{ {
snprintf (cached_file, 255, "%s/kernels/%d/markov_le.%s_%s_%s_%d.kernel", profile_dir, vendor_id, device_name, device_version, driver_version, COMPTIME); snprintf (cached_file, 255, "%s/kernels/%d/markov_le.%s.kernel", profile_dir, vendor_id, device_name_chksum);
} }
} }
@ -1655,9 +1655,9 @@ static void generate_source_kernel_amp_filename (const uint attack_kern, char *s
snprintf (source_file, 255, "%s/OpenCL/amp_a%d.cl", shared_dir, attack_kern); snprintf (source_file, 255, "%s/OpenCL/amp_a%d.cl", shared_dir, attack_kern);
} }
static void generate_cached_kernel_amp_filename (const uint attack_kern, char *profile_dir, char *device_name, char *device_version, char *driver_version, int vendor_id, char *cached_file) static void generate_cached_kernel_amp_filename (const uint attack_kern, char *profile_dir, char *device_name_chksum, int vendor_id, char *cached_file)
{ {
snprintf (cached_file, 255, "%s/kernels/%d/amp_a%d.%s_%s_%s_%d.kernel", profile_dir, vendor_id, attack_kern, device_name, device_version, driver_version, COMPTIME); snprintf (cached_file, 255, "%s/kernels/%d/amp_a%d.%s.kernel", profile_dir, vendor_id, attack_kern, device_name_chksum);
} }
static uint convert_from_hex (char *line_buf, const uint line_len) static uint convert_from_hex (char *line_buf, const uint line_len)
@ -12764,6 +12764,23 @@ int main (int argc, char **argv)
device_param->driver_version = mystrdup (tmp); device_param->driver_version = mystrdup (tmp);
// create some filename that is easier to read on cached folder
snprintf (tmp, sizeof (tmp) - 1, "%s-%s-%s-%d", device_param->device_name, device_param->device_version, device_param->driver_version, COMPTIME);
uint device_name_digest[4];
device_name_digest[0] = 0;
device_name_digest[1] = 0;
device_name_digest[2] = 0;
device_name_digest[3] = 0;
md5_64 ((uint *) tmp, device_name_digest);
sprintf (tmp, "%08x", device_name_digest[0]);
device_param->device_name_chksum = mystrdup (tmp);
if (device_type == CL_DEVICE_TYPE_CPU) if (device_type == CL_DEVICE_TYPE_CPU)
{ {
cl_uint gpu_processor_cores = 1; cl_uint gpu_processor_cores = 1;
@ -12952,11 +12969,9 @@ int main (int argc, char **argv)
* device properties * device properties
*/ */
char *device_name = device_param->device_name; char *device_name_chksum = device_param->device_name_chksum;
char *device_version = device_param->device_version;
char *driver_version = device_param->driver_version;
uint gpu_processors = device_param->gpu_processors; uint gpu_processors = device_param->gpu_processors;
uint gpu_processor_cores = device_param->gpu_processor_cores; uint gpu_processor_cores = device_param->gpu_processor_cores;
@ -13234,7 +13249,7 @@ int main (int argc, char **argv)
memset (cached_file, 0, sizeof (cached_file)); memset (cached_file, 0, sizeof (cached_file));
generate_cached_kernel_filename (attack_exec, attack_kern, kern_type, profile_dir, device_name, device_version, driver_version, vendor_id, cached_file); generate_cached_kernel_filename (attack_exec, attack_kern, kern_type, profile_dir, device_name_chksum, vendor_id, cached_file);
int cached = 1; int cached = 1;
@ -13365,7 +13380,7 @@ int main (int argc, char **argv)
memset (cached_file, 0, sizeof (cached_file)); memset (cached_file, 0, sizeof (cached_file));
generate_cached_kernel_mp_filename (opti_type, opts_type, profile_dir, device_name, device_version, driver_version, vendor_id, cached_file); generate_cached_kernel_mp_filename (opti_type, opts_type, profile_dir, device_name_chksum, vendor_id, cached_file);
int cached = 1; int cached = 1;
@ -13478,7 +13493,7 @@ int main (int argc, char **argv)
memset (cached_file, 0, sizeof (cached_file)); memset (cached_file, 0, sizeof (cached_file));
generate_cached_kernel_amp_filename (attack_kern, profile_dir, device_name, device_version, driver_version, vendor_id, cached_file); generate_cached_kernel_amp_filename (attack_kern, profile_dir, device_name_chksum, vendor_id, cached_file);
int cached = 1; int cached = 1;