arno
/
hashcat
mirror of https://github.com/hashcat/hashcat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Support hashes in outfiles in outfile-check folder without password

Browse Source
pull/1884/head
jsteube 5 years ago
parent b2154b7ed9
commit 3f2346e951
1 changed files with 77 additions and 68 deletions
Show Stats Download Patch File Download Diff File

145
src/outfile_check.c
Unescape View File

@ -194,111 +194,120 @@ static int outfile_remove (hashcat_ctx_t *hashcat_ctx)
if (line_len == 0) continue;
char *last_separator = strrchr (line_buf, separator);
// this fake separator is used to enable loading outfiles without password
if (last_separator == NULL) continue; // ??
line_buf[line_len] = separator;
char *line_pw_buf = last_separator + 1;
line_len++;
size_t line_pw_len = line_buf + line_len - line_pw_buf;
for (int tries = 0; tries < PW_MAX; tries++)
{
char *last_separator = strrchr (line_buf, separator);
char *line_hash_buf = line_buf;
if (last_separator == NULL) break;
int line_hash_len = last_separator - line_buf;
char *line_pw_buf = last_separator + 1;
line_hash_buf[line_hash_len] = 0;
size_t line_pw_len = line_buf + line_len - line_pw_buf;
if (line_hash_len == 0) continue;
char *line_hash_buf = line_buf;
if (hashconfig->is_salted == true)
{
memset (hash_buf.salt, 0, sizeof (salt_t));
}
int line_hash_len = last_separator - line_buf;
if (hashconfig->esalt_size > 0)
{
memset (hash_buf.esalt, 0, hashconfig->esalt_size);
}
line_hash_buf[line_hash_len] = 0;
if (hashconfig->hook_salt_size > 0)
{
memset (hash_buf.hook_salt, 0, hashconfig->hook_salt_size);
}
int parser_status = PARSER_HASH_LENGTH;
if (line_hash_len == 0) continue;
if (module_ctx->module_hash_decode_outfile != MODULE_DEFAULT)
{
parser_status = module_ctx->module_hash_decode_outfile (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, hash_buf.hash_info, line_buf, line_len - 1);
}
else
{
// "normal" case: hash in the outfile is the same as the hash in the original hash file
if (hashconfig->is_salted == true)
{
memset (hash_buf.salt, 0, sizeof (salt_t));
}
parser_status = module_ctx->module_hash_decode (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, hash_buf.hash_info, line_buf, line_len - 1);
}
if (hashconfig->esalt_size > 0)
{
memset (hash_buf.esalt, 0, hashconfig->esalt_size);
}
if (parser_status != PARSER_OK) continue;
if (hashconfig->hook_salt_size > 0)
{
memset (hash_buf.hook_salt, 0, hashconfig->hook_salt_size);
}
salt_t *salt_buf = salts_buf;
int parser_status = PARSER_HASH_LENGTH;
if (is_salted == true)
{
salt_buf = (salt_t *) hc_bsearch_r (hash_buf.salt, salts_buf, salts_cnt, sizeof (salt_t), sort_by_salt_buf, (void *) hashconfig);
}
if (module_ctx->module_hash_decode_outfile != MODULE_DEFAULT)
{
parser_status = module_ctx->module_hash_decode_outfile (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, hash_buf.hash_info, line_buf, line_len - 1);
}
else
{
// "normal" case: hash in the outfile is the same as the hash in the original hash file
if (salt_buf == NULL) continue;
parser_status = module_ctx->module_hash_decode (hashconfig, hash_buf.digest, hash_buf.salt, hash_buf.esalt, hash_buf.hash_info, line_buf, line_len - 1);
}
const u32 salt_pos = salt_buf - salts_buf; // the offset from the start of the array (unit: sizeof (salt_t))
if (parser_status != PARSER_OK) continue;
if (hashes->salts_shown[salt_pos] == 1) break; // already marked as cracked (no action needed)
salt_t *salt_buf = salts_buf;
u32 idx = salt_buf->digests_offset;
if (is_salted == true)
{
salt_buf = (salt_t *) hc_bsearch_r (hash_buf.salt, salts_buf, salts_cnt, sizeof (salt_t), sort_by_salt_buf, (void *) hashconfig);
}
bool cracked = false;
if (salt_buf == NULL) continue;
if (hashconfig->outfile_check_nocomp == true)
{
cracked = true;
}
else
{
char *digests_buf_ptr = digests_buf + (salt_buf->digests_offset * dgst_size);
u32 digests_buf_cnt = salt_buf->digests_cnt;
const u32 salt_pos = salt_buf - salts_buf; // the offset from the start of the array (unit: sizeof (salt_t))
char *digest_buf = (char *) hc_bsearch_r (hash_buf.digest, digests_buf_ptr, digests_buf_cnt, dgst_size, sort_by_digest_p0p1, (void *) hashconfig);
if (hashes->salts_shown[salt_pos] == 1) break; // already marked as cracked (no action needed)
if (digest_buf != NULL)
{
idx += (digest_buf - digests_buf_ptr) / dgst_size;
u32 idx = salt_buf->digests_offset;
if (hashes->digests_shown[idx] == 1) break;
bool cracked = false;
if (hashconfig->outfile_check_nocomp == true)
{
cracked = true;
}
}
else
{
char *digests_buf_ptr = digests_buf + (salt_buf->digests_offset * dgst_size);
u32 digests_buf_cnt = salt_buf->digests_cnt;
if (cracked == true)
{
hashes->digests_shown[idx] = 1;
char *digest_buf = (char *) hc_bsearch_r (hash_buf.digest, digests_buf_ptr, digests_buf_cnt, dgst_size, sort_by_digest_p0p1, (void *) hashconfig);
hashes->digests_done++;
if (digest_buf != NULL)
{
idx += (digest_buf - digests_buf_ptr) / dgst_size;
salt_buf->digests_done++;
if (hashes->digests_shown[idx] == 1) break;
cracked = true;
}
}
if (salt_buf->digests_done == salt_buf->digests_cnt)
if (cracked == true)
{
hashes->salts_shown[salt_pos] = 1;
hashes->digests_shown[idx] = 1;
hashes->salts_done++;
hashes->digests_done++;
if (hashes->salts_done == salts_cnt) mycracked (hashcat_ctx);
salt_buf->digests_done++;
if (salt_buf->digests_done == salt_buf->digests_cnt)
{
hashes->salts_shown[salt_pos] = 1;
hashes->salts_done++;
if (hashes->salts_done == salts_cnt) mycracked (hashcat_ctx);
}
break;
}
break;
if (status_ctx->shutdown_inner == true) break;
}
if (status_ctx->shutdown_inner == true) break;
}
hcfree (line_buf);

Write Preview
Loading…
Cancel
Save