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

Merge pull request #3654 from Chick3nman/brain-fixes

Browse Source 
Add sanity check for --brain-port, fix errors
This commit is contained in:
Jens Steube 2023-03-24 21:43:52 +01:00 committed by GitHub
commit d17c5a560d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@ -42,6 +42,7 @@
- Fixed debug mode 5 by adding the missing colon between original-word and finding-rule - Fixed debug mode 5 by adding the missing colon between original-word and finding-rule
- Skip generated rule that was the result of chaining rule operation and caused this generated rule to exceed the maximum number of function calls - Skip generated rule that was the result of chaining rule operation and caused this generated rule to exceed the maximum number of function calls
- Fixed incorrect plaintext check for 25400 and 26610. Increased plaintext check to 32 bytes to prevent false positives. - Fixed incorrect plaintext check for 25400 and 26610. Increased plaintext check to 32 bytes to prevent false positives.
- Fixed bug in --stdout that caused certain rules to malfunction
## ##
## Technical ## Technical
@ -51,6 +52,7 @@
- Apple Driver: Automatically enable GPU support on Apple OpenCL instead of CPU support - Apple Driver: Automatically enable GPU support on Apple OpenCL instead of CPU support
- Apple Driver: Updated requirements to use Apple OpenCL API to macOS 13.0 - use - Apple Driver: Updated requirements to use Apple OpenCL API to macOS 13.0 - use
- Backend Checks: Described workaround in error message when detecting more than 64 backend devices - Backend Checks: Described workaround in error message when detecting more than 64 backend devices
- Brain: Added sanity check and corresponding error message for invalid --brain-port values
- Modules: Added support for non-zero IVs for -m 6800 (Lastpass). Also added `tools/lastpass2hashcat.py` - Modules: Added support for non-zero IVs for -m 6800 (Lastpass). Also added `tools/lastpass2hashcat.py`
- Status Code: Add specific return code for self-test fail (-11) - Status Code: Add specific return code for self-test fail (-11)
- SCRYPT: Increase buffer sizes in module for hash mode 8900 to allow longer SCRYPT digests - SCRYPT: Increase buffer sizes in module for hash mode 8900 to allow longer SCRYPT digests

15
src/user_options.c
View File

@ -559,24 +559,31 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
return -1; return -1;
} }
#ifdef WITH_BRAIN #ifdef WITH_BRAIN
if ((user_options->brain_client == true) && (user_options->brain_server == true)) if ((user_options->brain_client == true) && (user_options->brain_server == true))
{ {
event_log_error (hashcat_ctx, "Can not have --brain-client and --brain-server at the same time"); event_log_error (hashcat_ctx, "Can not have --brain-client and --brain-server at the same time.");
return -1; return -1;
} }
if ((user_options->brain_client_features < 1) || (user_options->brain_client_features > 3)) if ((user_options->brain_client_features < 1) || (user_options->brain_client_features > 3))
{ {
event_log_error (hashcat_ctx, "Invalid --brain-client-feature argument"); event_log_error (hashcat_ctx, "Invalid --brain-client-feature argument.");
return -1; return -1;
} }
if (user_options->brain_port > 65535)
{
event_log_error (hashcat_ctx, "Invalid brain port specified (greater than 65535).");
return -1;
}
if ((user_options->brain_client == true) && (user_options->brain_password_chgd == false)) if ((user_options->brain_client == true) && (user_options->brain_password_chgd == false))
{ {
event_log_error (hashcat_ctx, "Brain clients need to set --brain-password"); event_log_error (hashcat_ctx, "Brain clients must specify --brain-password.");
return -1; return -1;
} }