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

Add PMKID/MIC to cracked output line in -m 22000 and -m 22001

Browse Source
pull/2293/head
Jens Steube 4 years ago
parent 616683df5c
commit 7797488a12
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File

25
src/modules/module_22000.c
Unescape View File

@ -1193,7 +1193,26 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
const u8 *mac_ap = (const u8 *) wpa->mac_ap;
const u8 *mac_sta = (const u8 *) wpa->mac_sta;
if (need_hexify ((const u8 *) wpa->essid_buf, wpa->essid_len, '*', 0) == true)
if (wpa->type == 1)
{
u32_to_hex (wpa->pmkid[0], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->pmkid[1], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->pmkid[2], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->pmkid[3], (u8 *) line_buf + line_len); line_len += 8;
}
else if (wpa->type == 2)
{
u32_to_hex (wpa->keymic[0], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->keymic[1], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->keymic[2], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->keymic[3], (u8 *) line_buf + line_len); line_len += 8;
}
line_buf[line_len] = ':';
line_len++;
if (need_hexify ((const u8 *) wpa->essid_buf, wpa->essid_len, ':', 0) == true)
{
char tmp_buf[128];
@ -1213,7 +1232,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
tmp_buf[tmp_len++] = 0;
line_len = snprintf (line_buf, line_size, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
line_len += snprintf (line_buf + line_len, line_size - line_len, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
mac_ap[0],
mac_ap[1],
mac_ap[2],
@ -1230,7 +1249,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
}
else
{
line_len = snprintf (line_buf, line_size, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
line_len += snprintf (line_buf + line_len, line_size - line_len, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
mac_ap[0],
mac_ap[1],
mac_ap[2],

25
src/modules/module_22001.c
Unescape View File

@ -1194,7 +1194,26 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
const u8 *mac_ap = (const u8 *) wpa->mac_ap;
const u8 *mac_sta = (const u8 *) wpa->mac_sta;
if (need_hexify ((const u8 *) wpa->essid_buf, wpa->essid_len, '*', 0) == true)
if (wpa->type == 1)
{
u32_to_hex (wpa->pmkid[0], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->pmkid[1], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->pmkid[2], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->pmkid[3], (u8 *) line_buf + line_len); line_len += 8;
}
else if (wpa->type == 2)
{
u32_to_hex (wpa->keymic[0], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->keymic[1], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->keymic[2], (u8 *) line_buf + line_len); line_len += 8;
u32_to_hex (wpa->keymic[3], (u8 *) line_buf + line_len); line_len += 8;
}
line_buf[line_len] = ':';
line_len++;
if (need_hexify ((const u8 *) wpa->essid_buf, wpa->essid_len, ':', 0) == true)
{
char tmp_buf[128];
@ -1214,7 +1233,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
tmp_buf[tmp_len++] = 0;
line_len = snprintf (line_buf, line_size, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
line_len += snprintf (line_buf + line_len, line_size - line_len, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
mac_ap[0],
mac_ap[1],
mac_ap[2],
@ -1231,7 +1250,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
}
else
{
line_len = snprintf (line_buf, line_size, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
line_len += snprintf (line_buf + line_len, line_size - line_len, "%02x%02x%02x%02x%02x%02x:%02x%02x%02x%02x%02x%02x:%s",
mac_ap[0],
mac_ap[1],
mac_ap[2],

Write Preview
Loading…
Cancel
Save