arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-23 16:38:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #413 from philsmd/master

Browse Source 
special case handling for commas within masks of .hcmask file
This commit is contained in:
Jens Steube 2016-07-04 14:03:55 +02:00 committed by GitHub
commit 30919d4641
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hashcat.c
View File

@ -17499,6 +17499,36 @@ int main (int argc, char **argv)
mask = mask + str_pos + 1; mask = mask + str_pos + 1;
} }
/**
* What follows is a very special case where "\," is within the mask field of a line in a .hcmask file only because otherwise (without the "\")
* it would be interpreted as a custom charset definition.
*
* We need to replace all "\," with just "," within the mask (but allow the special case "\\," which means "\" followed by ",")
* Note: "\\" is not needed to replace all "\" within the mask! The meaning of "\\" within a line containing the string "\\," is just to allow "\" followed by ","
*/
uint mask_len_cur = strlen (mask);
uint mask_out_pos = 0;
char mask_prev = 0;
for (uint mask_iter = 0; mask_iter < mask_len_cur; mask_iter++, mask_out_pos++)
{
if (mask[mask_iter] == ',')
{
if (mask_prev == '\\')
{
mask_out_pos -= 1; // this means: skip the previous "\"
}
}
mask_prev = mask[mask_iter];
mask[mask_out_pos] = mask[mask_iter];
}
mask[mask_out_pos] = '\0';
} }
if ((attack_mode == ATTACK_MODE_HYBRID1) || (attack_mode == ATTACK_MODE_HYBRID2)) if ((attack_mode == ATTACK_MODE_HYBRID1) || (attack_mode == ATTACK_MODE_HYBRID2))