arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-29 03:12:35 +00:00
Code Issues Releases Wiki Activity

Add hash line separator backward compatibility for -m 16800

Browse Source
This commit is contained in:
jsteube 2019-04-09 19:13:30 +02:00
parent 8f62085ea4
commit 764ca0c1c6
2 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modules/module_16800.c
View File

@ -304,29 +304,46 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
wpa_pmkid_t *wpa_pmkid = (wpa_pmkid_t *) esalt_buf; wpa_pmkid_t *wpa_pmkid = (wpa_pmkid_t *) esalt_buf;
// detect old/new format
int old_sep = 0;
int new_sep = 0;
for (int i = 0; i < line_len; i++)
{
const char c = line_buf[i];
if (c == '*') old_sep++;
if (c == ':') new_sep++;
}
const u8 sep = (new_sep > old_sep) ? ':' : '*';
// start normal parsing
token_t token; token_t token;
token.token_cnt = 4; token.token_cnt = 4;
token.sep[0] = ':'; token.sep[0] = sep;
token.len_min[0] = 32; token.len_min[0] = 32;
token.len_max[0] = 32; token.len_max[0] = 32;
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
token.sep[1] = ':'; token.sep[1] = sep;
token.len_min[1] = 12; token.len_min[1] = 12;
token.len_max[1] = 12; token.len_max[1] = 12;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
token.sep[2] = ':'; token.sep[2] = sep;
token.len_min[2] = 12; token.len_min[2] = 12;
token.len_max[2] = 12; token.len_max[2] = 12;
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
token.sep[3] = ':'; token.sep[3] = sep;
token.len_min[3] = 0; token.len_min[3] = 0;
token.len_max[3] = 64; token.len_max[3] = 64;
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH

31
src/modules/module_16801.c
View File

@ -326,25 +326,42 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
wpa_pmkid_t *wpa_pmkid = (wpa_pmkid_t *) esalt_buf; wpa_pmkid_t *wpa_pmkid = (wpa_pmkid_t *) esalt_buf;
// detect old/new format
int old_sep = 0;
int new_sep = 0;
for (int i = 0; i < line_len; i++)
{
const char c = line_buf[i];
if (c == '*') old_sep++;
if (c == ':') new_sep++;
}
const u8 sep = (new_sep > old_sep) ? ':' : '*';
// start normal parsing
token_t token; token_t token;
// real 16801 pmkid hash-lines // real 16801 pmkid hash-lines
token.token_cnt = 3; token.token_cnt = 3;
token.sep[0] = ':'; token.sep[0] = sep;
token.len_min[0] = 32; token.len_min[0] = 32;
token.len_max[0] = 32; token.len_max[0] = 32;
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
token.sep[1] = ':'; token.sep[1] = sep;
token.len_min[1] = 12; token.len_min[1] = 12;
token.len_max[1] = 12; token.len_max[1] = 12;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
token.sep[2] = ':'; token.sep[2] = sep;
token.len_min[2] = 12; token.len_min[2] = 12;
token.len_max[2] = 12; token.len_max[2] = 12;
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
@ -358,25 +375,25 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
token.token_cnt = 4; token.token_cnt = 4;
token.sep[0] = ':'; token.sep[0] = sep;
token.len_min[0] = 32; token.len_min[0] = 32;
token.len_max[0] = 32; token.len_max[0] = 32;
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
token.sep[1] = ':'; token.sep[1] = sep;
token.len_min[1] = 12; token.len_min[1] = 12;
token.len_max[1] = 12; token.len_max[1] = 12;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
token.sep[2] = ':'; token.sep[2] = sep;
token.len_min[2] = 12; token.len_min[2] = 12;
token.len_max[2] = 12; token.len_max[2] = 12;
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
token.sep[3] = ':'; token.sep[3] = sep;
token.len_min[3] = 0; token.len_min[3] = 0;
token.len_max[3] = 64; token.len_max[3] = 64;
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH