arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-11 00:01:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/hashcat/hashcat

Browse Source
This commit is contained in:
Jens Steube 2020-03-12 10:53:52 +01:00
commit 2e8d6854c1
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -162,6 +162,7 @@
- Kernel Compile: Removed -cl-std= from all kernel build options since we're compatible to all OpenCL versions - Kernel Compile: Removed -cl-std= from all kernel build options since we're compatible to all OpenCL versions
- OpenCL Kernels: Fix OpenCL compiler warning on double precision constants - OpenCL Kernels: Fix OpenCL compiler warning on double precision constants
- OpenCL Kernels: Moved "gpu_decompress", "gpu_memset" and "gpu_atinit" into shared.cl in order to reduce compile time - OpenCL Kernels: Moved "gpu_decompress", "gpu_memset" and "gpu_atinit" into shared.cl in order to reduce compile time
- OpenCL Options: Set --spin-damp to 0 (disabled) by default. With the CUDA backend this workaround became deprecated
- OpenCL Options: Removed --opencl-platforms filter in order to force backend device numbers to stay constant - OpenCL Options: Removed --opencl-platforms filter in order to force backend device numbers to stay constant
- Parsers: switched from strtok() to strtok_r() for thread safety - Parsers: switched from strtok() to strtok_r() for thread safety
- Requirements: Add new requirement for NVIDIA GPU: CUDA Toolkit (9.0 or later) - Requirements: Add new requirement for NVIDIA GPU: CUDA Toolkit (9.0 or later)

2
include/types.h
View File

@ -638,7 +638,7 @@ typedef enum user_options_defaults
SKIP = 0, SKIP = 0,
SLOW_CANDIDATES = false, SLOW_CANDIDATES = false,
SPEED_ONLY = false, SPEED_ONLY = false,
SPIN_DAMP = 8, SPIN_DAMP = 0,
STATUS = false, STATUS = false,
STATUS_JSON = false, STATUS_JSON = false,
STATUS_TIMER = 10, STATUS_TIMER = 10,

12
src/backend.c
View File

@ -3661,14 +3661,14 @@ int run_kernel (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param, con
const u32 iterationm = iteration % EXPECTED_ITERATIONS; const u32 iterationm = iteration % EXPECTED_ITERATIONS;
cl_int opencl_event_status;
size_t param_value_size_ret;
if (hc_clGetEventInfo (hashcat_ctx, opencl_event, CL_EVENT_COMMAND_EXECUTION_STATUS, sizeof (opencl_event_status), &opencl_event_status, &param_value_size_ret) == -1) return -1;
if (device_param->spin_damp > 0) if (device_param->spin_damp > 0)
{ {
cl_int opencl_event_status;
size_t param_value_size_ret;
if (hc_clGetEventInfo (hashcat_ctx, opencl_event, CL_EVENT_COMMAND_EXECUTION_STATUS, sizeof (opencl_event_status), &opencl_event_status, &param_value_size_ret) == -1) return -1;
double spin_total = device_param->spin_damp; double spin_total = device_param->spin_damp;
while (opencl_event_status != CL_COMPLETE) while (opencl_event_status != CL_COMPLETE)

2
src/usage.c
View File

@ -101,7 +101,7 @@ static const char *const USAGE_BIG_PRE_HASHMODES[] =
" -u, --kernel-loops | Num | Manual workload tuning, set innerloop step size to X | -u 256", " -u, --kernel-loops | Num | Manual workload tuning, set innerloop step size to X | -u 256",
" -T, --kernel-threads | Num | Manual workload tuning, set thread count to X | -T 64", " -T, --kernel-threads | Num | Manual workload tuning, set thread count to X | -T 64",
" --backend-vector-width | Num | Manually override backend vector-width to X | --backend-vector=4", " --backend-vector-width | Num | Manually override backend vector-width to X | --backend-vector=4",
" --spin-damp | Num | Use CPU for device synchronization, in percent | --spin-damp=50", " --spin-damp | Num | Use CPU for device synchronization, in percent | --spin-damp=10",
" --hwmon-disable | | Disable temperature and fanspeed reads and triggers |", " --hwmon-disable | | Disable temperature and fanspeed reads and triggers |",
" --hwmon-temp-abort | Num | Abort if temperature reaches X degrees Celsius | --hwmon-temp-abort=100", " --hwmon-temp-abort | Num | Abort if temperature reaches X degrees Celsius | --hwmon-temp-abort=100",
" --scrypt-tmto | Num | Manually override TMTO value for scrypt to X | --scrypt-tmto=3", " --scrypt-tmto | Num | Manually override TMTO value for scrypt to X | --scrypt-tmto=3",