1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-26 18:08:20 +00:00

Merge pull request #1485 from philsmd/master

masks: skipping too large/small masks fixed
This commit is contained in:
Jens Steube 2018-01-03 16:00:30 +01:00 committed by GitHub
commit 185104b5bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -25,6 +25,7 @@
- Fixed a hash parsing problem for 7-Zip hashes: allow a longer crc32 data length field within the hash format
- Fixed the output of --show if $HEX[] passwords are present within the potfile
- Fixed a restore issue leading to "Restore value is greater than keyspace" in case mask-files or wordlist-folders were used
- Fixed a mask-length check issue: Return -1 in case the mask-length is not within the password-length range
##
## Improvements

View File

@ -1284,18 +1284,20 @@ int mask_ctx_update_loop (hashcat_ctx_t *hashcat_ctx)
if (mask_ctx->css_cnt < mask_min)
{
event_log_warning (hashcat_ctx, "Skipping mask '%s' because it is smaller than the minimum password length.", mask_ctx->mask);
event_log_warning (hashcat_ctx, NULL);
}
if (mask_ctx->css_cnt > mask_max)
{
event_log_warning (hashcat_ctx, "Skipping mask '%s' because it is larger than the maximum password length.", mask_ctx->mask);
event_log_warning (hashcat_ctx, NULL);
}
// skip to next mask
logfile_sub_msg ("STOP");
return 0;
return -1;
}
if (hashconfig->opts_type & OPTS_TYPE_PT_UTF16LE)