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

Merge pull request #1452 from philsmd/master

Browse Source 
fixes #1447: prevent hexifying the $HEX[] passwords again in --show runs
This commit is contained in:
Jens Steube 2017-11-17 10:23:42 +01:00 committed by GitHub
commit c8819e6e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -11,6 +11,7 @@
##
- Fixed a hash parsing problem when using --show/--left together with hashes with long salts that require pure kernels
- Fixed the output of --show if $HEX[] passwords are present within the potfile
* changes v4.0.0 -> v4.0.1:

14
src/outfile.c
View File

@ -444,9 +444,19 @@ int outfile_write (hashcat_ctx_t *hashcat_ctx, const char *out_buf, const unsign
if (outfile_ctx->outfile_format & OUTFILE_FMT_PLAIN)
{
const bool always_ascii = (hashconfig->hash_type & OPTS_TYPE_PT_ALWAYS_ASCII) ? true : false;
bool convert_to_hex = false;
if ((user_options->outfile_autohex == true) && (need_hexify (plain_ptr, plain_len, hashconfig->separator, always_ascii) == true))
if (user_options->show == false)
{
if (user_options->outfile_autohex == true)
{
const bool always_ascii = (hashconfig->hash_type & OPTS_TYPE_PT_ALWAYS_ASCII) ? true : false;
convert_to_hex = need_hexify (plain_ptr, plain_len, hashconfig->separator, always_ascii);
}
}
if (convert_to_hex)
{
tmp_buf[tmp_len++] = '$';
tmp_buf[tmp_len++] = 'H';