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

Add support for rule: eX

Browse Source
This commit is contained in:
mhasbini 2017-04-30 16:23:39 +03:00
parent ef6467b49b
commit 5734741392
8 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenCL/inc_rp.cl
View File

@ -2454,7 +2454,7 @@ inline u32 rule_op_mangle_dupeblock_last (const u32 p0, const u32 p1, u32 buf0[4
return out_len; return out_len;
} }
inline u32 rule_op_mangle_title (const u32 p0, const u32 p1, u32 buf0[4], u32 buf1[4], const u32 in_len) inline u32 rule_op_mangle_title_sep (const u32 p0, const u32 p1, u32 buf0[4], u32 buf1[4], const u32 in_len)
{ {
buf0[0] |= (generate_cmask (buf0[0])); buf0[0] |= (generate_cmask (buf0[0]));
buf0[1] |= (generate_cmask (buf0[1])); buf0[1] |= (generate_cmask (buf0[1]));
@ -2468,7 +2468,7 @@ inline u32 rule_op_mangle_title (const u32 p0, const u32 p1, u32 buf0[4], u32 bu
u32 tib40[4]; u32 tib40[4];
u32 tib41[4]; u32 tib41[4];
const uchar4 tmp0 = (uchar4) (' '); const uchar4 tmp0 = (uchar4) (p0);
const uchar4 tmp1 = (uchar4) (0x00); const uchar4 tmp1 = (uchar4) (0x00);
const uchar4 tmp2 = (uchar4) (0xff); const uchar4 tmp2 = (uchar4) (0xff);
@ -2542,7 +2542,8 @@ inline u32 apply_rule (const u32 name, const u32 p0, const u32 p1, u32 buf0[4],
case RULE_OP_MANGLE_REPLACE_NM1: out_len = rule_op_mangle_replace_nm1 (p0, p1, buf0, buf1, out_len); break; case RULE_OP_MANGLE_REPLACE_NM1: out_len = rule_op_mangle_replace_nm1 (p0, p1, buf0, buf1, out_len); break;
case RULE_OP_MANGLE_DUPEBLOCK_FIRST: out_len = rule_op_mangle_dupeblock_first (p0, p1, buf0, buf1, out_len); break; case RULE_OP_MANGLE_DUPEBLOCK_FIRST: out_len = rule_op_mangle_dupeblock_first (p0, p1, buf0, buf1, out_len); break;
case RULE_OP_MANGLE_DUPEBLOCK_LAST: out_len = rule_op_mangle_dupeblock_last (p0, p1, buf0, buf1, out_len); break; case RULE_OP_MANGLE_DUPEBLOCK_LAST: out_len = rule_op_mangle_dupeblock_last (p0, p1, buf0, buf1, out_len); break;
case RULE_OP_MANGLE_TITLE: out_len = rule_op_mangle_title (p0, p1, buf0, buf1, out_len); break; case RULE_OP_MANGLE_TITLE_SEP: out_len = rule_op_mangle_title_sep (p0, p1, buf0, buf1, out_len); break;
case RULE_OP_MANGLE_TITLE: out_len = rule_op_mangle_title_sep (' ', p1, buf0, buf1, out_len); break;
} }
return out_len; return out_len;

1
OpenCL/inc_rp.h
View File

@ -32,6 +32,7 @@
#define RULE_OP_MANGLE_DUPECHAR_FIRST 'z' #define RULE_OP_MANGLE_DUPECHAR_FIRST 'z'
#define RULE_OP_MANGLE_DUPECHAR_LAST 'Z' #define RULE_OP_MANGLE_DUPECHAR_LAST 'Z'
#define RULE_OP_MANGLE_DUPECHAR_ALL 'q' #define RULE_OP_MANGLE_DUPECHAR_ALL 'q'
#define RULE_OP_MANGLE_TITLE_SEP 'e'
#define RULE_OP_REJECT_LESS '<' #define RULE_OP_REJECT_LESS '<'
#define RULE_OP_REJECT_GREATER '>' #define RULE_OP_REJECT_GREATER '>'

1
docs/changes.txt
View File

@ -12,6 +12,7 @@
- Wordlist encoding: Support added for internal convert from and to user-defined encoding during runtime - Wordlist encoding: Support added for internal convert from and to user-defined encoding during runtime
- Wordlist encoding: Added parameters --encoding-from and --encoding-to to configure wordlist encoding handling - Wordlist encoding: Added parameters --encoding-from and --encoding-to to configure wordlist encoding handling
- Rules: Support added for rule 'eX'
## ##
## Improvements ## Improvements

1
docs/rules.txt
View File

@ -38,6 +38,7 @@
#define RULE_OP_MANGLE_DUPEBLOCK_FIRST 'y' // duplicates first n characters #define RULE_OP_MANGLE_DUPEBLOCK_FIRST 'y' // duplicates first n characters
#define RULE_OP_MANGLE_DUPEBLOCK_LAST 'Y' // duplicates last n characters #define RULE_OP_MANGLE_DUPEBLOCK_LAST 'Y' // duplicates last n characters
#define RULE_OP_MANGLE_TITLE 'E' // lowercase everything then upper case the first letter and every letter after a space #define RULE_OP_MANGLE_TITLE 'E' // lowercase everything then upper case the first letter and every letter after a space
#define RULE_OP_MANGLE_TITLE_SEP 'e' // lowercase everything then upper case the first letter and every letter after char X
/* With -j or -k only */ /* With -j or -k only */

1
include/types.h
View File

@ -280,6 +280,7 @@ typedef enum rule_functions
RULE_OP_MANGLE_EXTRACT_MEMORY = 'X', RULE_OP_MANGLE_EXTRACT_MEMORY = 'X',
RULE_OP_MANGLE_APPEND_MEMORY = '4', RULE_OP_MANGLE_APPEND_MEMORY = '4',
RULE_OP_MANGLE_PREPEND_MEMORY = '6', RULE_OP_MANGLE_PREPEND_MEMORY = '6',
RULE_OP_MANGLE_TITLE_SEP = 'e',
RULE_OP_MEMORIZE_WORD = 'M', RULE_OP_MEMORIZE_WORD = 'M',

13
src/rp.c
View File

@ -58,7 +58,8 @@ static const char grp_op_chr[] =
{ {
RULE_OP_MANGLE_APPEND, RULE_OP_MANGLE_APPEND,
RULE_OP_MANGLE_PREPEND, RULE_OP_MANGLE_PREPEND,
RULE_OP_MANGLE_PURGECHAR RULE_OP_MANGLE_PURGECHAR,
RULE_OP_MANGLE_TITLE_SEP
}; };
static const char grp_op_chr_chr[] = static const char grp_op_chr_chr[] =
@ -444,6 +445,11 @@ int cpu_rule_to_kernel_rule (char *rule_buf, u32 rule_len, kernel_rule_t *rule)
SET_NAME (rule, rule_buf[rule_pos]); SET_NAME (rule, rule_buf[rule_pos]);
break; break;
case RULE_OP_MANGLE_TITLE_SEP:
SET_NAME (rule, rule_buf[rule_pos]);
SET_P0 (rule, rule_buf[rule_pos]);
break;
default: default:
return -1; return -1;
} }
@ -662,6 +668,11 @@ int kernel_rule_to_cpu_rule (char *rule_buf, kernel_rule_t *rule)
rule_buf[rule_pos] = rule_cmd; rule_buf[rule_pos] = rule_cmd;
break; break;
case RULE_OP_MANGLE_TITLE_SEP:
rule_buf[rule_pos] = rule_cmd;
GET_P0 (rule);
break;
case 0: case 0:
if (rule_pos == 0) return -1; if (rule_pos == 0) return -1;
return rule_pos - 1; return rule_pos - 1;

11
src/rp_cpu.c
View File

@ -431,7 +431,7 @@ static int mangle_chr_decr (char arr[BLOCK_SIZE], int arr_len, int upos)
return (arr_len); return (arr_len);
} }
static int mangle_title (char arr[BLOCK_SIZE], int arr_len) static int mangle_title_sep (char arr[BLOCK_SIZE], int arr_len, char c)
{ {
int upper_next = 1; int upper_next = 1;
@ -439,7 +439,7 @@ static int mangle_title (char arr[BLOCK_SIZE], int arr_len)
for (pos = 0; pos < arr_len; pos++) for (pos = 0; pos < arr_len; pos++)
{ {
if (arr[pos] == ' ') if (arr[pos] == c)
{ {
upper_next = 1; upper_next = 1;
@ -702,8 +702,13 @@ int _old_apply_rule (char *rule, int rule_len, char in[BLOCK_SIZE], int in_len,
if ((upos >= 1) && ((upos + 0) < out_len)) mangle_overstrike (out, out_len, upos, out[upos - 1]); if ((upos >= 1) && ((upos + 0) < out_len)) mangle_overstrike (out, out_len, upos, out[upos - 1]);
break; break;
case RULE_OP_MANGLE_TITLE_SEP:
NEXT_RULEPOS (rule_pos);
out_len = mangle_title_sep (out, out_len, rule[rule_pos]);
break;
case RULE_OP_MANGLE_TITLE: case RULE_OP_MANGLE_TITLE:
out_len = mangle_title (out, out_len); out_len = mangle_title_sep (out, out_len, ' ');
break; break;
case RULE_OP_MANGLE_EXTRACT_MEMORY: case RULE_OP_MANGLE_EXTRACT_MEMORY:

23
src/rp_kernel_on_cpu.c
View File

@ -2393,7 +2393,7 @@ static u32 rule_op_mangle_dupeblock_last (MAYBE_UNUSED const u32 p0, MAYBE_UNUSE
return out_len; return out_len;
} }
static u32 rule_op_mangle_title (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 buf0[4], MAYBE_UNUSED u32 buf1[4], const u32 in_len) static u32 rule_op_mangle_title_sep (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 buf0[4], MAYBE_UNUSED u32 buf1[4], const u32 in_len)
{ {
buf0[0] |= (generate_cmask (buf0[0])); buf0[0] |= (generate_cmask (buf0[0]));
buf0[1] |= (generate_cmask (buf0[1])); buf0[1] |= (generate_cmask (buf0[1]));
@ -2406,6 +2406,8 @@ static u32 rule_op_mangle_title (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u
buf0[0] &= ~(0x00000020 & generate_cmask (buf0[0])); buf0[0] &= ~(0x00000020 & generate_cmask (buf0[0]));
const u8 tmp2 = (u8) p0;
for (u32 i = 0; i < in_len; i++) for (u32 i = 0; i < in_len; i++)
{ {
u32 tmp0 = 0; u32 tmp0 = 0;
@ -2479,35 +2481,35 @@ static u32 rule_op_mangle_title (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u
if (i < 3) if (i < 3)
{ {
if (tmp0 == ' ') buf0[0] &= tmp1 ; if (tmp0 == tmp2) buf0[0] &= tmp1 ;
} }
else if (i < 7) else if (i < 7)
{ {
if (tmp0 == ' ') buf0[1] &= tmp1 ; if (tmp0 == tmp2) buf0[1] &= tmp1 ;
} }
else if (i < 11) else if (i < 11)
{ {
if (tmp0 == ' ') buf0[2] &= tmp1 ; if (tmp0 == tmp2) buf0[2] &= tmp1 ;
} }
else if (i < 15) else if (i < 15)
{ {
if (tmp0 == ' ') buf0[3] &= tmp1 ; if (tmp0 == tmp2) buf0[3] &= tmp1 ;
} }
else if (i < 19) else if (i < 19)
{ {
if (tmp0 == ' ') buf1[0] &= tmp1 ; if (tmp0 == tmp2) buf1[0] &= tmp1 ;
} }
else if (i < 23) else if (i < 23)
{ {
if (tmp0 == ' ') buf1[1] &= tmp1 ; if (tmp0 == tmp2) buf1[1] &= tmp1 ;
} }
else if (i < 27) else if (i < 27)
{ {
if (tmp0 == ' ') buf1[2] &= tmp1 ; if (tmp0 == tmp2) buf1[2] &= tmp1 ;
} }
else if (i < 31) else if (i < 31)
{ {
if (tmp0 == ' ') buf1[3] &= tmp1 ; if (tmp0 == tmp2) buf1[3] &= tmp1 ;
} }
} }
@ -2559,7 +2561,8 @@ u32 apply_rule (const u32 name, const u32 p0, const u32 p1, u32 buf0[4], u32 buf
case RULE_OP_MANGLE_REPLACE_NM1: out_len = rule_op_mangle_replace_nm1 (p0, p1, buf0, buf1, out_len); break; case RULE_OP_MANGLE_REPLACE_NM1: out_len = rule_op_mangle_replace_nm1 (p0, p1, buf0, buf1, out_len); break;
case RULE_OP_MANGLE_DUPEBLOCK_FIRST: out_len = rule_op_mangle_dupeblock_first (p0, p1, buf0, buf1, out_len); break; case RULE_OP_MANGLE_DUPEBLOCK_FIRST: out_len = rule_op_mangle_dupeblock_first (p0, p1, buf0, buf1, out_len); break;
case RULE_OP_MANGLE_DUPEBLOCK_LAST: out_len = rule_op_mangle_dupeblock_last (p0, p1, buf0, buf1, out_len); break; case RULE_OP_MANGLE_DUPEBLOCK_LAST: out_len = rule_op_mangle_dupeblock_last (p0, p1, buf0, buf1, out_len); break;
case RULE_OP_MANGLE_TITLE: out_len = rule_op_mangle_title (p0, p1, buf0, buf1, out_len); break; case RULE_OP_MANGLE_TITLE_SEP: out_len = rule_op_mangle_title_sep (p0, p1, buf0, buf1, out_len); break;
case RULE_OP_MANGLE_TITLE: out_len = rule_op_mangle_title_sep (' ', p1, buf0, buf1, out_len); break;
} }
return out_len; return out_len;