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 pull request #1154 from philsmd/master

Browse Source 
fixes #1153: incorrect error message while combining --keyspace with custom charset
This commit is contained in:
Jens Steube 2017-03-04 12:55:24 +01:00 committed by GitHub
commit cc5d6815ae
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/changes.txt
View File

@ -1,3 +1,11 @@
* changes v3.40 -> ?:
##
## Bugs
##
- Fixed a problem where --keyspace combined with custom charsets incorrectly displayed an error message
* changes v3.30 -> v3.40:
##

7
src/user_options.c
View File

@ -820,9 +820,12 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
if (user_options->hc_argc < 2)
{
event_log_error (hashcat_ctx, "You need to specify a mask if you specify a custom-charset");
if (user_options->keyspace == false) // --keyspace would be a special case, i.e. we do not need a hash file
{
event_log_error (hashcat_ctx, "You need to specify a mask if you specify a custom-charset");
return -1;
return -1;
}
}
}