arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-22 21:51:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1200 from philsmd/master

Browse Source 
minor: cleaned up code and updated docs wrt #1195
This commit is contained in:
Jens Steube 2017-03-22 12:00:18 +01:00 committed by GitHub
commit 5419ec7acd
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -25,6 +25,7 @@
- Fixed --remove was not applied in case all hashes have been cracked by potfile or weak-hash check - Fixed --remove was not applied in case all hashes have been cracked by potfile or weak-hash check
- Fixed a race condition when a session finishes the input-base was freed but accessed afterwards - Fixed a race condition when a session finishes the input-base was freed but accessed afterwards
- Fixed a hash validation error when trying to load Android FDE < 4.3 hashes - Fixed a hash validation error when trying to load Android FDE < 4.3 hashes
- Fixed --outfile-format 11 up to --outfile-format 15: the crack position was not correctly outputted
## ##
## Technical ## Technical

15
src/outfile.c
View File

@ -343,17 +343,6 @@ void outfile_write_close (hashcat_ctx_t *hashcat_ctx)
fclose (outfile_ctx->fp); fclose (outfile_ctx->fp);
} }
int numDigits(u64 number)
{
int digits = 0;
while (number) {
number /= 10;
digits++;
}
return digits;
}
int outfile_write (hashcat_ctx_t *hashcat_ctx, const char *out_buf, const unsigned char *plain_ptr, const u32 plain_len, const u64 crackpos, const unsigned char *username, const u32 user_len, char tmp_buf[HCBUFSIZ_LARGE]) int outfile_write (hashcat_ctx_t *hashcat_ctx, const char *out_buf, const unsigned char *plain_ptr, const u32 plain_len, const u64 crackpos, const unsigned char *username, const u32 user_len, char tmp_buf[HCBUFSIZ_LARGE])
{ {
const hashconfig_t *hashconfig = hashcat_ctx->hashconfig; const hashconfig_t *hashconfig = hashcat_ctx->hashconfig;
@ -444,9 +433,7 @@ int outfile_write (hashcat_ctx_t *hashcat_ctx, const char *out_buf, const unsign
if (outfile_ctx->outfile_format & OUTFILE_FMT_CRACKPOS) if (outfile_ctx->outfile_format & OUTFILE_FMT_CRACKPOS)
{ {
int digit_len = numDigits(crackpos); tmp_len += snprintf (tmp_buf + tmp_len, HCBUFSIZ_LARGE - tmp_len, "%" PRIu64, crackpos);
snprintf (tmp_buf + tmp_len, HCBUFSIZ_LARGE - tmp_len, "%" PRIu64, crackpos);
tmp_len += digit_len + 1 ;
} }
tmp_buf[tmp_len] = 0; tmp_buf[tmp_len] = 0;