1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-23 23:19:09 +00:00

Merge pull request #463 from philsmd/master

sanity check for #457: do not allow mask files or increment w/ --skip/--limit
This commit is contained in:
Jens Steube 2016-08-18 14:44:09 +02:00 committed by GitHub
commit e87f45ba48
2 changed files with 16 additions and 0 deletions

View File

@ -25,6 +25,7 @@
- Add support for --outfile (short -o) to be used together with --stdout
- Skip periodic status output whenever --stdout is used together with stdin mode, but no outfile was specified
- Show error message if --show is used together with --outfile-autohex-disable (this is currently not supported)
- Show error message if --skip/--limit is used together with mask files or --increment
##
## Bugs

View File

@ -18914,9 +18914,24 @@ int main (int argc, char **argv)
qsort (induction_dictionaries, induction_dictionaries_cnt, sizeof (char *), sort_by_mtime);
}
/**
* prevent the user from using --skip/--limit together w/ maskfile and or dictfile
*/
if (skip != 0 || limit != 0)
{
if ((maskcnt > 1) || (dictcnt > 1))
{
log_error ("ERROR: --skip/--limit are not supported with --increment or mask files");
return -1;
}
}
/**
* prevent the user from using --keyspace together w/ maskfile and or dictfile
*/
if (keyspace == 1)
{
if ((maskcnt > 1) || (dictcnt > 1))