From 227a5aa09242bd729c51564ef7c4b490fa40d51f Mon Sep 17 00:00:00 2001 From: philsmd Date: Thu, 9 Nov 2017 11:36:01 +0100 Subject: [PATCH] fix #1435: --show/--left hash parsing fixed for hashes with long salts --- docs/changes.txt | 8 ++++++++ src/opencl.c | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/docs/changes.txt b/docs/changes.txt index 4608e9510..ead00e3f9 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -1,3 +1,11 @@ +* changes v4.0.1 -> xxx: + +## +## Bugs +## + +- Fixed a hash parsing problem when using --show/--left together with hashes with long salts that require pure kernels + * changes v4.0.0 -> v4.0.1: ## diff --git a/src/opencl.c b/src/opencl.c index aa3212d5d..6ae202dd6 100644 --- a/src/opencl.c +++ b/src/opencl.c @@ -329,6 +329,8 @@ void generate_source_kernel_filename (const u32 attack_exec, const u32 attack_ke snprintf (source_file, 255, "%s/OpenCL/m%05d_a1-optimized.cl", shared_dir, (int) kern_type); else if (attack_kern == ATTACK_KERN_BF) snprintf (source_file, 255, "%s/OpenCL/m%05d_a3-optimized.cl", shared_dir, (int) kern_type); + else if (attack_kern == ATTACK_KERN_NONE) + snprintf (source_file, 255, "%s/OpenCL/m%05d_a0-optimized.cl", shared_dir, (int) kern_type); } else { @@ -345,6 +347,8 @@ void generate_source_kernel_filename (const u32 attack_exec, const u32 attack_ke snprintf (source_file, 255, "%s/OpenCL/m%05d_a1.cl", shared_dir, (int) kern_type); else if (attack_kern == ATTACK_KERN_BF) snprintf (source_file, 255, "%s/OpenCL/m%05d_a3.cl", shared_dir, (int) kern_type); + else if (attack_kern == ATTACK_KERN_NONE) + snprintf (source_file, 255, "%s/OpenCL/m%05d_a0.cl", shared_dir, (int) kern_type); } else { @@ -365,6 +369,8 @@ void generate_cached_kernel_filename (const u32 attack_exec, const u32 attack_ke snprintf (cached_file, 255, "%s/kernels/m%05d_a1-optimized.%s.kernel", profile_dir, (int) kern_type, device_name_chksum); else if (attack_kern == ATTACK_KERN_BF) snprintf (cached_file, 255, "%s/kernels/m%05d_a3-optimized.%s.kernel", profile_dir, (int) kern_type, device_name_chksum); + else if (attack_kern == ATTACK_KERN_NONE) + snprintf (cached_file, 255, "%s/kernels/m%05d_a0-optimized.%s.kernel", profile_dir, (int) kern_type, device_name_chksum); } else { @@ -381,6 +387,8 @@ void generate_cached_kernel_filename (const u32 attack_exec, const u32 attack_ke snprintf (cached_file, 255, "%s/kernels/m%05d_a1.%s.kernel", profile_dir, (int) kern_type, device_name_chksum); else if (attack_kern == ATTACK_KERN_BF) snprintf (cached_file, 255, "%s/kernels/m%05d_a3.%s.kernel", profile_dir, (int) kern_type, device_name_chksum); + else if (attack_kern == ATTACK_KERN_NONE) + snprintf (cached_file, 255, "%s/kernels/m%05d_a0.%s.kernel", profile_dir, (int) kern_type, device_name_chksum); } else {