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

Merge pull request #2744 from davidbolvansky/hash_show

Browse Source 
Machine readable mode for show hash feature
This commit is contained in:
Jens Steube 2021-04-05 12:59:04 +02:00 committed by GitHub
commit 6663fe4161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/hashes.c
View File

@ -1187,7 +1187,17 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
compress_terminal_line_length (tmp_line_buf, 38, 32); compress_terminal_line_length (tmp_line_buf, 38, 32);
event_log_warning (hashcat_ctx, "Hashfile '%s' on line %u (%s): %s", hashes->hashfile, line_num, tmp_line_buf, strparser (parser_status)); if (user_options->machine_readable == true) {
event_log_warning(hashcat_ctx, "%s:%u:%s:%s", hashes->hashfile,
line_num, tmp_line_buf,
strparser(parser_status));
} else {
event_log_warning(hashcat_ctx,
"Hashfile '%s' on line %u (%s): %s",
hashes->hashfile, line_num, tmp_line_buf,
strparser(parser_status));
}
hcfree (tmp_line_buf); hcfree (tmp_line_buf);
@ -1211,7 +1221,17 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
compress_terminal_line_length (tmp_line_buf, 38, 32); compress_terminal_line_length (tmp_line_buf, 38, 32);
event_log_warning (hashcat_ctx, "Hashfile '%s' on line %u (%s): %s", hashes->hashfile, line_num, tmp_line_buf, strparser (parser_status)); if (user_options->machine_readable == true) {
event_log_warning(hashcat_ctx, "%s:%u:%s:%s", hashes->hashfile,
line_num, tmp_line_buf,
strparser(parser_status));
} else {
event_log_warning(hashcat_ctx,
"Hashfile '%s' on line %u (%s): %s",
hashes->hashfile, line_num, tmp_line_buf,
strparser(parser_status));
}
hcfree (tmp_line_buf); hcfree (tmp_line_buf);
@ -1237,7 +1257,17 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
compress_terminal_line_length (tmp_line_buf, 38, 32); compress_terminal_line_length (tmp_line_buf, 38, 32);
event_log_warning (hashcat_ctx, "Hashfile '%s' on line %u (%s): %s", hashes->hashfile, line_num, tmp_line_buf, strparser (parser_status)); if (user_options->machine_readable == true) {
event_log_warning(hashcat_ctx, "%s:%u:%s:%s", hashes->hashfile,
line_num, tmp_line_buf,
strparser(parser_status));
} else {
event_log_warning(hashcat_ctx,
"Hashfile '%s' on line %u (%s): %s",
hashes->hashfile, line_num, tmp_line_buf,
strparser(parser_status));
}
hcfree (tmp_line_buf); hcfree (tmp_line_buf);
@ -1264,7 +1294,17 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx)
compress_terminal_line_length (tmp_line_buf, 38, 32); compress_terminal_line_length (tmp_line_buf, 38, 32);
event_log_warning (hashcat_ctx, "Hashfile '%s' on line %u (%s): %s", hashes->hashfile, line_num, tmp_line_buf, strparser (parser_status)); if (user_options->machine_readable == true) {
event_log_warning(hashcat_ctx, "%s:%u:%s:%s", hashes->hashfile,
line_num, tmp_line_buf,
strparser(parser_status));
} else {
event_log_warning(hashcat_ctx,
"Hashfile '%s' on line %u (%s): %s",
hashes->hashfile, line_num, tmp_line_buf,
strparser(parser_status));
}
hcfree (tmp_line_buf); hcfree (tmp_line_buf);