1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-13 19:28:56 +00:00

Merge pull request #1256 from 0xbsec/reject_unless_equal

Add support for rejection rule _N
This commit is contained in:
Jens Steube 2017-05-20 11:24:38 +02:00 committed by GitHub
commit 5611d7f950
5 changed files with 21 additions and 0 deletions

View File

@ -18,6 +18,7 @@
- Rules: Support added for rule 'eX'
- Rules: Support added for position 'p' in host mode (using -j or -k)
- 7-Zip cracking: increased max. data length to 320k and removed AES padding attack to avoid false negatives
- Rules: Support added for rejection rule '_N' in host mode
##
## Workarounds

View File

@ -49,6 +49,7 @@
#define RULE_OP_REJECT_LESS '<' // reject plains of length greater than N
#define RULE_OP_REJECT_GREATER '>' // reject plains of length less than N
#define RULE_OP_REJECT_EQUAL '_' // reject plains of length not equal to N
#define RULE_OP_REJECT_CONTAIN '!' // reject plains that contain char X
#define RULE_OP_REJECT_NOT_CONTAIN '/' // reject plains that do not contain char X
#define RULE_OP_REJECT_EQUAL_FIRST '(' // reject plains that do not contain char X at first position

View File

@ -286,6 +286,7 @@ typedef enum rule_functions
RULE_OP_REJECT_LESS = '<',
RULE_OP_REJECT_GREATER = '>',
RULE_OP_REJECT_EQUAL = '_',
RULE_OP_REJECT_CONTAIN = '!',
RULE_OP_REJECT_NOT_CONTAIN = '/',
RULE_OP_REJECT_EQUAL_FIRST = '(',

View File

@ -766,6 +766,12 @@ int _old_apply_rule (char *rule, int rule_len, char in[BLOCK_SIZE], int in_len,
if (out_len < upos) return (RULE_RC_REJECT_ERROR);
break;
case RULE_OP_REJECT_EQUAL:
NEXT_RULEPOS (rule_pos);
NEXT_RPTOI (rule, rule_pos, upos);
if (out_len != upos) return (RULE_RC_REJECT_ERROR);
break;
case RULE_OP_REJECT_CONTAIN:
NEXT_RULEPOS (rule_pos);
if (strchr (out, rule[rule_pos]) != NULL) return (RULE_RC_REJECT_ERROR);

View File

@ -499,6 +499,18 @@ uMl6:
ab
abc
_2:
mode: 1
input: |
a
ab
abc
123456790abcdefghijklmnopqrstuvw
123456790abcdefghijklmnopqrstuvwx
expected_output: |
ab
'!a':
mode: 1
input: |