|
|
|
@ -268,7 +268,12 @@ static int mp_expand (hashcat_ctx_t *hashcat_ctx, const char *in_buf, size_t in_
|
|
|
|
|
{
|
|
|
|
|
in_pos++;
|
|
|
|
|
|
|
|
|
|
if (in_pos == in_len) break;
|
|
|
|
|
if (in_pos == in_len)
|
|
|
|
|
{
|
|
|
|
|
event_log_error (hashcat_ctx, "Syntax error in mask: %s", in_buf);
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
u32 p1 = in_buf[in_pos] & 0xff;
|
|
|
|
|
|
|
|
|
@ -306,7 +311,7 @@ static int mp_expand (hashcat_ctx_t *hashcat_ctx, const char *in_buf, size_t in_
|
|
|
|
|
break;
|
|
|
|
|
case '?': rc = mp_add_cs_buf (hashcat_ctx, &p0, 1, mp_usr, mp_usr_offset);
|
|
|
|
|
break;
|
|
|
|
|
default: event_log_error (hashcat_ctx, "Syntax error: %s", in_buf);
|
|
|
|
|
default: event_log_error (hashcat_ctx, "Syntax error in mask: %s", in_buf);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -372,7 +377,12 @@ static int mp_gen_css (hashcat_ctx_t *hashcat_ctx, char *mask_buf, size_t mask_l
|
|
|
|
|
{
|
|
|
|
|
mask_pos++;
|
|
|
|
|
|
|
|
|
|
if (mask_pos == mask_len) break;
|
|
|
|
|
if (mask_pos == mask_len)
|
|
|
|
|
{
|
|
|
|
|
event_log_error (hashcat_ctx, "Syntax error in mask: %s", mask_buf);
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char p1 = mask_buf[mask_pos];
|
|
|
|
|
|
|
|
|
@ -412,7 +422,7 @@ static int mp_gen_css (hashcat_ctx_t *hashcat_ctx, char *mask_buf, size_t mask_l
|
|
|
|
|
break;
|
|
|
|
|
case '?': rc = mp_add_cs_buf (hashcat_ctx, &chr, 1, css_buf, css_pos);
|
|
|
|
|
break;
|
|
|
|
|
default: event_log_error (hashcat_ctx, "Syntax error: %s", mask_buf);
|
|
|
|
|
default: event_log_error (hashcat_ctx, "Syntax error in mask: %s", mask_buf);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|