arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-13 19:28:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into updated_TestUnit_handlingWiteSpaceInPath

Browse Source
This commit is contained in:
Jens Steube 2022-01-18 18:58:19 +01:00 committed by GitHub
commit d565fb9c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changes.txt
View File

@ -30,6 +30,7 @@
- Fixed false negative on Unit Test in case of out-of-memory with grep in single mode
- Fixed Unit Test early exit on luks test file download/extract failure
- Fixed Unit Test false negative if there are spaces in the filesystem path to hashcat
- Fixed --hash-info example password output: force uppercase if OPTS_TYPE_PT_UPPER is set
##
## Technical
@ -52,6 +53,7 @@
- Status code: updated negative status code, usefull in Unit tests engine (test.sh)
- Unit tests: added -r (--runtime) option
- Unit tests: handle negative status code, skip deprecated hash-types, skip hash-types with known perl modules issues, updated output
- Hash Info: show more information (Updated Hash-Format. Added Autodetect, Self-Test, Potfile and Plaintext encoding)
* changes v6.2.4 -> v6.2.5

40
src/terminal.c
View File

@ -667,7 +667,14 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
{
if (hashconfig->opts_type & OPTS_TYPE_BINARY_HASHFILE)
{
event_log_info (hashcat_ctx, " Example.Hash.Format.: hex-encoded");
if (hashconfig->opts_type & OPTS_TYPE_BINARY_HASHFILE_OPTIONAL)
{
event_log_info (hashcat_ctx, " Example.Hash.Format.: hex-encoded");
}
else
{
event_log_info (hashcat_ctx, " Example.Hash.Format.: hex-encoded (binary file only)");
}
event_log_info (hashcat_ctx, " Example.Hash........: %s", hashconfig->st_hash);
}
else
@ -699,6 +706,20 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
hcfree (tmp_buf);
}
else if (hashconfig->opts_type & OPTS_TYPE_PT_UPPER)
{
size_t st_pass_len = strlen (hashconfig->st_pass);
char *tmp_buf = (char *) hcmalloc (st_pass_len + 1);
strncpy (tmp_buf, hashconfig->st_pass, st_pass_len);
uppercase ((u8 *) tmp_buf, st_pass_len);
event_log_info (hashcat_ctx, " Example.Pass........: %s", tmp_buf);
hcfree (tmp_buf);
}
else
{
event_log_info (hashcat_ctx, " Example.Pass........: %s", hashconfig->st_pass);
@ -720,6 +741,23 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
event_log_info (hashcat_ctx, " Benchmark.Mask......: N/A");
}
event_log_info (hashcat_ctx, " Autodetect.Enabled..: %s", (hashconfig->opts_type & OPTS_TYPE_AUTODETECT_DISABLE) ? "No" : "Yes");
event_log_info (hashcat_ctx, " Self.Test.Enabled...: %s", (hashconfig->opts_type & OPTS_TYPE_SELF_TEST_DISABLE) ? "No" : "Yes");
event_log_info (hashcat_ctx, " Potfile.Enabled.....: %s", (hashconfig->opts_type & OPTS_TYPE_POTFILE_NOPASS) ? "No" : "Yes");
if (hashconfig->opts_type & OPTS_TYPE_PT_ALWAYS_ASCII)
{
event_log_info (hashcat_ctx, " Plaintext.Encoding..: ASCII only");
}
else if (hashconfig->opts_type & OPTS_TYPE_PT_ALWAYS_HEXIFY)
{
event_log_info (hashcat_ctx, " Plaintext.Encoding..: HEX only");
}
else
{
event_log_info (hashcat_ctx, " Plaintext.Encoding..: ASCII, HEX");
}
event_log_info (hashcat_ctx, NULL);
}

6
tools/test_modules/m28200.pm
View File

@ -8,11 +8,9 @@
use strict;
use warnings;
use Crypt::ScryptKDF qw (scrypt_hash scrypt_raw);
use Crypt::CBC;
use MIME::Base64 qw (decode_base64 encode_base64);
use Digest::SHA qw (sha512);
use Crypt::AuthEnc::GCM;
use Crypt::ScryptKDF qw (scrypt_raw);
use MIME::Base64 qw (decode_base64 encode_base64);
sub module_constraints { [[0, 256], [64, 64], [-1, -1], [-1, -1], [-1, -1]] }