mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-26 09:58:16 +00:00
sanity check: do not allow mask files or increment w/ --skip/--limit
This commit is contained in:
parent
40f3efb1f2
commit
665e960093
@ -25,6 +25,7 @@
|
|||||||
- Add support for --outfile (short -o) to be used together with --stdout
|
- 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
|
- 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 --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
|
## Bugs
|
||||||
|
@ -18914,9 +18914,24 @@ int main (int argc, char **argv)
|
|||||||
qsort (induction_dictionaries, induction_dictionaries_cnt, sizeof (char *), sort_by_mtime);
|
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
|
* prevent the user from using --keyspace together w/ maskfile and or dictfile
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (keyspace == 1)
|
if (keyspace == 1)
|
||||||
{
|
{
|
||||||
if ((maskcnt > 1) || (dictcnt > 1))
|
if ((maskcnt > 1) || (dictcnt > 1))
|
||||||
|
Loading…
Reference in New Issue
Block a user