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

Returncode: Enforce returncode 0 in case the user selected --speed-only or --progress-only and no other error occured

Browse Source
This commit is contained in:
jsteube 2018-02-01 11:18:40 +01:00
parent a8ca6862bf
commit 3272e29497
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -56,6 +56,7 @@
- OpenCL Kernels: Replace variables from uXX to uXXa if used in __constant space - OpenCL Kernels: Replace variables from uXX to uXXa if used in __constant space
- OpenCL Kernels: Use a special kernel to initialize the password buffer used during autotune measurements, to reduce startup time - OpenCL Kernels: Use a special kernel to initialize the password buffer used during autotune measurements, to reduce startup time
- OpenCL Kernels: Use static declaraction for uXXa variables used in __constant space - OpenCL Kernels: Use static declaraction for uXXa variables used in __constant space
- Returncode: Enforce returncode 0 in case the user selected --speed-only or --progress-only and no other error occured
- Self Test: Skip self-test for mode 15700 because the settings are too high and cause startup times that are too long - Self Test: Skip self-test for mode 15700 because the settings are too high and cause startup times that are too long
- Self Test: Skip self-test for mode 8900 - user-configurable scrypt settings are incompatible with fixed settings in the self-test hash - Self Test: Skip self-test for mode 8900 - user-configurable scrypt settings are incompatible with fixed settings in the self-test hash
- Terminal: Send clear line code to the same output stream as the message immediately following - Terminal: Send clear line code to the same output stream as the message immediately following

16
src/hashcat.c
View File

@ -268,6 +268,22 @@ static int inner2_loop (hashcat_ctx_t *hashcat_ctx)
status_ctx->devices_status = STATUS_EXHAUSTED; status_ctx->devices_status = STATUS_EXHAUSTED;
} }
if (status_ctx->devices_status == STATUS_EXHAUSTED)
{
// the options speed-only and progress-only cause hashcat to abort quickly.
// therefore, they will end up (if no other error occured) as STATUS_EXHAUSTED.
// however, that can create confusion in hashcats RC, because exhausted translates to RC = 1.
// but then having RC = 1 does not match our expection if we use for speed-only and progress-only.
// to get hashcat to return RC = 0 we have to set it to CRACKED or BYPASS
// note: other options like --show, --left, --benchmark, --keyspace, --opencl-info, etc.
// not not reach this section of the code, they've returned already with rc 0.
if ((user_options->speed_only == true) || (user_options->progress_only == true))
{
status_ctx->devices_status = STATUS_BYPASS;
}
}
// update some timer // update some timer
time_t runtime_stop; time_t runtime_stop;