1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-23 15:18:16 +00:00

Added sanity check to disallow --speed-only in combination with -i

This commit is contained in:
jsteube 2016-12-09 15:26:35 +01:00
parent 58f458f489
commit f9ba94954b
2 changed files with 12 additions and 0 deletions

View File

@ -17,6 +17,7 @@
## Technical ## Technical
## ##
- Sanity: Added sanity check to disallow --speed-only in combination with -i
- Potfile: In v3.10 already, the default potfile suffix changed but the note about was missing. The "hashcat.pot" became "hashcat.potfile" - Potfile: In v3.10 already, the default potfile suffix changed but the note about was missing. The "hashcat.pot" became "hashcat.potfile"
- Threads: Replaced all calls to strerror() with %m printf() GNU extension to ensure thread safety - Threads: Replaced all calls to strerror() with %m printf() GNU extension to ensure thread safety
- Threads: Replaced all calls to ctime() with ctime_r() to ensure thread safety - Threads: Replaced all calls to ctime() with ctime_r() to ensure thread safety

View File

@ -465,6 +465,13 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
return -1; return -1;
} }
if ((user_options->increment == true) && (user_options->speed_only == true))
{
event_log_error (hashcat_ctx, "Increment is not allowed in combination with --speed-only");
return -1;
}
if ((user_options->increment == true) && (user_options->attack_mode == ATTACK_MODE_STRAIGHT)) if ((user_options->increment == true) && (user_options->attack_mode == ATTACK_MODE_STRAIGHT))
{ {
event_log_error (hashcat_ctx, "Increment is not allowed in attack-mode 0"); event_log_error (hashcat_ctx, "Increment is not allowed in attack-mode 0");
@ -1069,6 +1076,10 @@ void user_options_preprocess (hashcat_ctx_t *hashcat_ctx)
else if (user_options->opencl_info == true) else if (user_options->opencl_info == true)
{ {
}
else if (user_options->speed_only == true)
{
} }
else if (user_options->keyspace == true) else if (user_options->keyspace == true)
{ {