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

Merge pull request #462 from philsmd/master

Browse Source 
add sanity check to disallow --show and --outfile-autohex-disable
This commit is contained in:
Jens Steube 2016-08-18 14:27:32 +02:00 committed by GitHub
commit 40f3efb1f2
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -24,6 +24,7 @@
- Add support for @ rule (RULE_OP_MANGLE_PURGECHAR) to use on GPU - Add support for @ rule (RULE_OP_MANGLE_PURGECHAR) to use on GPU
- 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)
## ##
## Bugs ## Bugs

10
src/hashcat.c
View File

@ -7226,6 +7226,16 @@ int main (int argc, char **argv)
} }
} }
if (show == 1)
{
if (outfile_autohex == 0)
{
log_error ("ERROR: Mixing outfile-autohex-disable parameter not allowed with show parameter");
return -1;
}
}
uint attack_kern = ATTACK_KERN_NONE; uint attack_kern = ATTACK_KERN_NONE;
switch (attack_mode) switch (attack_mode)