arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-16 02:31:02 +00:00
Code Issues Releases Wiki Activity

Some better error messages for custom charset file

Browse Source
This commit is contained in:
jsteube 2016-11-12 12:21:02 +01:00
parent d0f7fee029
commit d54c838bda
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mpsp.c
View File

@ -553,7 +553,7 @@ static int mp_setup_usr (hashcat_ctx_t *hashcat_ctx, cs_t *mp_sys, cs_t *mp_usr,
if (!feof (fp)) if (!feof (fp))
{ {
event_log_error (hashcat_ctx, "%s: File is too large", buf); event_log_error (hashcat_ctx, "%s: Custom charset file is too large", buf);
return -1; return -1;
} }
@ -562,27 +562,23 @@ static int mp_setup_usr (hashcat_ctx_t *hashcat_ctx, cs_t *mp_sys, cs_t *mp_usr,
if (nread == 0) if (nread == 0)
{ {
event_log_error (hashcat_ctx, "%s: File is empty", buf); event_log_error (hashcat_ctx, "%s: Custom charset file is empty", buf);
return -1; return -1;
} }
const int len = in_superchop (mp_file); const size_t len = in_superchop (mp_file);
if (len == 0) if (len == 0)
{ {
event_log_warning (hashcat_ctx, "Charset file corrupted"); event_log_error (hashcat_ctx, "%s: Custom charset file is corrupted", buf);
const int rc = mp_expand (hashcat_ctx, buf, strlen (buf), mp_sys, mp_usr, index, 1);
if (rc == -1) return -1; if (rc == -1) return -1;
} }
else
{
const int rc = mp_expand (hashcat_ctx, mp_file, (size_t) len, mp_sys, mp_usr, index, 0);
if (rc == -1) return -1; const int rc = mp_expand (hashcat_ctx, mp_file, len, mp_sys, mp_usr, index, 0);
}
if (rc == -1) return -1;
} }
return 0; return 0;