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

Merge pull request #1721 from Naufragous/pr-conflict-fix

Browse Source 
Fix conflicts caused by PR GH-1717
This commit is contained in:
Jens Steube 2018-10-19 11:22:26 +02:00 committed by GitHub
commit a83da1f00b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -49,6 +49,7 @@
- Fixed detection of unique ESSID in WPA-PMKID-* parser - Fixed detection of unique ESSID in WPA-PMKID-* parser
- Fixed speed/delay problem when quitting while the outfile folder is being scanned - Fixed speed/delay problem when quitting while the outfile folder is being scanned
- Fixed a race condition in status view leading to out-of-bound reads - Fixed a race condition in status view leading to out-of-bound reads
- Fixed the tokenizer configuration in postgres hash parser
- Fixed missing wordlist encoding in combinator mode - Fixed missing wordlist encoding in combinator mode
* changes v4.2.0 -> v4.2.1 * changes v4.2.0 -> v4.2.1

46
src/interface.c
View File

@ -4884,7 +4884,7 @@ int postgresql_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
token.len_min[1] = 32; token.len_min[1] = 0;
token.len_max[1] = 32; token.len_max[1] = 32;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH; token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH;
@ -17842,6 +17842,20 @@ int wpa_pmkid_pmk_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MA
const int rc_tokenizer2 = input_tokenizer (input_buf, input_len, &token); const int rc_tokenizer2 = input_tokenizer (input_buf, input_len, &token);
if (rc_tokenizer2 != PARSER_OK) return (rc_tokenizer); if (rc_tokenizer2 != PARSER_OK) return (rc_tokenizer);
// essid
u8 *essid_buf = token.buf[3];
int essid_len = token.len[3];
u8 *essid_ptr = (u8 *) wpa_pmkid->essid_buf;
for (int i = 0, j = 0; i < essid_len; i += 2, j += 1)
{
essid_ptr[j] = hex_to_u8 (essid_buf + i);
}
wpa_pmkid->essid_len = essid_len / 2;
} }
// pmkid // pmkid
@ -22161,6 +22175,35 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le
wpa_pmkid_t *wpa_pmkid = &wpa_pmkids[digest_cur]; wpa_pmkid_t *wpa_pmkid = &wpa_pmkids[digest_cur];
if (wpa_pmkid->essid_len)
{
exec_hexify ((const u8*) wpa_pmkid->essid_buf, wpa_pmkid->essid_len, (u8 *) tmp_buf);
int tmp_len = wpa_pmkid->essid_len * 2;
tmp_buf[tmp_len] = 0;
snprintf (out_buf, out_len - 1, "%08x%08x%08x%08x*%02x%02x%02x%02x%02x%02x*%02x%02x%02x%02x%02x%02x:%s",
wpa_pmkid->pmkid[0],
wpa_pmkid->pmkid[1],
wpa_pmkid->pmkid[2],
wpa_pmkid->pmkid[3],
wpa_pmkid->orig_mac_ap[0],
wpa_pmkid->orig_mac_ap[1],
wpa_pmkid->orig_mac_ap[2],
wpa_pmkid->orig_mac_ap[3],
wpa_pmkid->orig_mac_ap[4],
wpa_pmkid->orig_mac_ap[5],
wpa_pmkid->orig_mac_sta[0],
wpa_pmkid->orig_mac_sta[1],
wpa_pmkid->orig_mac_sta[2],
wpa_pmkid->orig_mac_sta[3],
wpa_pmkid->orig_mac_sta[4],
wpa_pmkid->orig_mac_sta[5],
tmp_buf);
}
else
{
snprintf (out_buf, out_len - 1, "%08x%08x%08x%08x*%02x%02x%02x%02x%02x%02x*%02x%02x%02x%02x%02x%02x", snprintf (out_buf, out_len - 1, "%08x%08x%08x%08x*%02x%02x%02x%02x%02x%02x*%02x%02x%02x%02x%02x%02x",
wpa_pmkid->pmkid[0], wpa_pmkid->pmkid[0],
wpa_pmkid->pmkid[1], wpa_pmkid->pmkid[1],
@ -22179,6 +22222,7 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le
wpa_pmkid->orig_mac_sta[4], wpa_pmkid->orig_mac_sta[4],
wpa_pmkid->orig_mac_sta[5]); wpa_pmkid->orig_mac_sta[5]);
} }
}
else if (hash_mode == 16900) else if (hash_mode == 16900)
{ {
ansible_vault_t *ansible_vaults = (ansible_vault_t *) esalts_buf; ansible_vault_t *ansible_vaults = (ansible_vault_t *) esalts_buf;