arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-07-01 04:12:44 +00:00
Code Issues Releases Wiki Activity

Fix user_options_check_files() in case -b is used

Browse Source
This commit is contained in:
jsteube 2017-01-27 15:06:31 +01:00
parent 9408c2fec8
commit e2b2dc7ae0
1 changed files with 66 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/user_options.c
View File

@ -1348,6 +1348,8 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
{ {
// mode easy mode here because both files must exist and readable // mode easy mode here because both files must exist and readable
if (user_options_extra->hc_workc == 2)
{
char *dictfile1 = user_options_extra->hc_workv[0]; char *dictfile1 = user_options_extra->hc_workv[0];
char *dictfile2 = user_options_extra->hc_workv[1]; char *dictfile2 = user_options_extra->hc_workv[1];
@ -1365,10 +1367,13 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
return -1; return -1;
} }
} }
}
else if (user_options->attack_mode == ATTACK_MODE_BF) else if (user_options->attack_mode == ATTACK_MODE_BF)
{ {
// if the file exist it's a maskfile and then it must be readable // if the file exist it's a maskfile and then it must be readable
if (user_options_extra->hc_workc == 1)
{
char *maskfile = user_options_extra->hc_workv[0]; char *maskfile = user_options_extra->hc_workv[0];
if (hc_path_exist (maskfile) == true) if (hc_path_exist (maskfile) == true)
@ -1381,7 +1386,10 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
} }
} }
} }
}
else if (user_options->attack_mode == ATTACK_MODE_HYBRID1) else if (user_options->attack_mode == ATTACK_MODE_HYBRID1)
{
if (user_options_extra->hc_workc == 2)
{ {
char *wlfile = user_options_extra->hc_workv[0]; char *wlfile = user_options_extra->hc_workv[0];
@ -1408,7 +1416,10 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
} }
} }
} }
}
else if (user_options->attack_mode == ATTACK_MODE_HYBRID2) else if (user_options->attack_mode == ATTACK_MODE_HYBRID2)
{
if (user_options_extra->hc_workc == 2)
{ {
char *wlfile = user_options_extra->hc_workv[1]; char *wlfile = user_options_extra->hc_workv[1];
@ -1435,6 +1446,7 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
} }
} }
} }
}
// logfile // logfile
@ -1557,6 +1569,8 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
// dictstat // dictstat
if (dictstat_ctx->enabled == true) if (dictstat_ctx->enabled == true)
{
if (hc_path_exist (dictstat_ctx->filename) == true)
{ {
if (hc_path_write (dictstat_ctx->filename) == false) if (hc_path_write (dictstat_ctx->filename) == false)
{ {
@ -1565,6 +1579,7 @@ int user_options_check_files (hashcat_ctx_t *hashcat_ctx)
return -1; return -1;
} }
} }
}
// loopback - can't check at this point // loopback - can't check at this point