DeforaNetworks/hashcat
3
0
Fork 0
Code Releases Activity

remove original commented code

Browse Source
This commit is contained in:
Gabriele Gristina
2019-06-22 15:00:50 +02:00
parent 05dfa7f3aa
commit b2529af172
72 changed files with 0 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/dispatch.c
View File

@@ -427,10 +427,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
{
char *dictfile = straight_ctx->dict;
// FILE *fp = fopen (dictfile, "rb");
fp_tmp_t fp_t;
// if (fp == NULL)
if (hc_fopen (&fp_t, dictfile, "rb") == false)
{
event_log_error (hashcat_ctx, "%s: %s", dictfile, strerror (errno));
@@ -442,7 +440,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
memset (&extra_info_straight, 0, sizeof (extra_info_straight));
// extra_info_straight.fp = fp;
extra_info_straight.fp_t = &fp_t;
hashcat_ctx_t *hashcat_ctx_tmp = (hashcat_ctx_t *) hcmalloc (sizeof (hashcat_ctx_t));
@@ -455,7 +452,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (rc_wl_data_init == -1)
{
// fclose (fp);
hc_fclose (&fp_t);
hcfree (hashcat_ctx_tmp->wl_data);
@@ -667,7 +663,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (CL_rc == -1)
{
// fclose (fp);
hc_fclose (&fp_t);
hcfree (hashcat_ctx_tmp->wl_data);
@@ -681,7 +676,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (CL_rc == -1)
{
// fclose (fp);
hc_fclose (&fp_t);
hcfree (hashcat_ctx_tmp->wl_data);
@@ -727,7 +721,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (words_fin == 0) break;
}
// fclose (fp);
hc_fclose (&fp_t);
wl_data_destroy (hashcat_ctx_tmp);
@@ -754,10 +747,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
combs_file = combinator_ctx->dict1;
}
// FILE *base_fp = fopen (base_file, "rb");
fp_tmp_t base_fp_t;
// if (base_fp == NULL)
if (hc_fopen (&base_fp_t, base_file, "rb") == false)
{
event_log_error (hashcat_ctx, "%s: %s", base_file, strerror (errno));
@@ -765,10 +756,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
return -1;
}
// FILE *combs_fp = fopen (combs_file, "rb");
fp_tmp_t combs_fp_t;
// if (combs_fp == NULL)
if (hc_fopen (&combs_fp_t, combs_file, "rb") == false)
{
event_log_error (hashcat_ctx, "%s: %s", combs_file, strerror (errno));
@@ -780,8 +769,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
memset (&extra_info_combi, 0, sizeof (extra_info_combi));
// extra_info_combi.base_fp = base_fp;
// extra_info_combi.combs_fp = combs_fp;
extra_info_combi.base_fp_t = &base_fp_t;
extra_info_combi.combs_fp_t = &combs_fp_t;
extra_info_combi.scratch_buf = device_param->scratch_buf;
@@ -796,10 +783,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (rc_wl_data_init == -1)
{
// fclose (combs_fp);
hc_fclose (&combs_fp_t);
// fclose (base_fp);
hc_fclose (&base_fp_t);
hcfree (hashcat_ctx_tmp->wl_data);
@@ -1011,10 +996,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (CL_rc == -1)
{
// fclose (combs_fp);
hc_fclose (&combs_fp_t);
// fclose (base_fp);
hc_fclose (&base_fp_t);
hcfree (hashcat_ctx_tmp->wl_data);
@@ -1028,10 +1011,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (CL_rc == -1)
{
// fclose (combs_fp);
hc_fclose (&combs_fp_t);
// fclose (base_fp);
hc_fclose (&base_fp_t);
hcfree (hashcat_ctx_tmp->wl_data);
@@ -1077,10 +1058,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (words_fin == 0) break;
}
// fclose (combs_fp);
hc_fclose (&combs_fp_t);
// fclose (base_fp);
hc_fclose (&base_fp_t);
wl_data_destroy (hashcat_ctx_tmp);
@@ -1343,10 +1322,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
{
char *dictfile = straight_ctx->dict;
// FILE *combs_fp = fopen (dictfile, "rb");
fp_tmp_t combs_fp_t;
// if (combs_fp == NULL)
if (hc_fopen (&combs_fp_t, dictfile, "rb") == false)
{
event_log_error (hashcat_ctx, "%s: %s", dictfile, strerror (errno));
@@ -1354,7 +1331,6 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
return -1;
}
// device_param->combs_fp = combs_fp;
device_param->combs_fp_t = &combs_fp_t;
}
@@ -1412,10 +1388,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
{
const char *dictfilec = combinator_ctx->dict2;
// FILE *combs_fp = fopen (dictfilec, "rb");
fp_tmp_t combs_fp_t;
// if (combs_fp == NULL)
if (hc_fopen (&combs_fp_t, dictfilec, "rb") == false)
{
event_log_error (hashcat_ctx, "%s: %s", combinator_ctx->dict2, strerror (errno));
@@ -1423,17 +1397,14 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
return -1;
}
// device_param->combs_fp = combs_fp;
device_param->combs_fp_t = &combs_fp_t;
}
else if (combs_mode == COMBINATOR_MODE_BASE_RIGHT)
{
const char *dictfilec = combinator_ctx->dict1;
// FILE *combs_fp = fopen (dictfilec, "rb");
fp_tmp_t combs_fp_t;
// if (combs_fp == NULL)
if (hc_fopen (&combs_fp_t, dictfilec, "rb") == false)
{
event_log_error (hashcat_ctx, "%s: %s", dictfilec, strerror (errno));
@@ -1441,15 +1412,12 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
return -1;
}
// device_param->combs_fp = combs_fp;
device_param->combs_fp_t = &combs_fp_t;
}
}
// FILE *fd = fopen (dictfile, "rb");
fp_tmp_t fp_t;
// if (fd == NULL)
if (hc_fopen (&fp_t, dictfile, "rb") == false)
{
event_log_error (hashcat_ctx, "%s: %s", dictfile, strerror (errno));
@@ -1467,10 +1435,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (rc_wl_data_init == -1)
{
// if (attack_mode == ATTACK_MODE_COMBI) fclose (device_param->combs_fp);
if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (device_param->combs_fp_t);
// fclose (fd);
hc_fclose (&fp_t);
hcfree (hashcat_ctx_tmp->wl_data);
@@ -1510,12 +1476,10 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
char rule_buf_out[RP_PASSWORD_SIZE];
// for ( ; words_cur < words_off; words_cur++) get_next_word (hashcat_ctx_tmp, fd, &line_buf, &line_len);
for ( ; words_cur < words_off; words_cur++) get_next_word (hashcat_ctx_tmp, &fp_t, &line_buf, &line_len);
for ( ; words_cur < words_fin; words_cur++)
{
// get_next_word (hashcat_ctx_tmp, fd, &line_buf, &line_len);
get_next_word (hashcat_ctx_tmp, &fp_t, &line_buf, &line_len);
line_len = (u32) convert_from_hex (hashcat_ctx, line_buf, line_len);
@@ -1603,10 +1567,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (CL_rc == -1)
{
// if (attack_mode == ATTACK_MODE_COMBI) fclose (device_param->combs_fp);
if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (device_param->combs_fp_t);
// fclose (fd);
hc_fclose (&fp_t);
hcfree (hashcat_ctx_tmp->wl_data);
@@ -1620,10 +1582,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (CL_rc == -1)
{
// if (attack_mode == ATTACK_MODE_COMBI) fclose (device_param->combs_fp);
if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (device_param->combs_fp_t);
// fclose (fd);
hc_fclose (&fp_t);
hcfree (hashcat_ctx_tmp->wl_data);
@@ -1678,10 +1638,8 @@ static int calc (hashcat_ctx_t *hashcat_ctx, hc_device_param_t *device_param)
if (words_fin == 0) break;
}
// if (attack_mode == ATTACK_MODE_COMBI) fclose (device_param->combs_fp);
if (attack_mode == ATTACK_MODE_COMBI) hc_fclose (device_param->combs_fp_t);
// fclose (fd);
hc_fclose (&fp_t);
wl_data_destroy (hashcat_ctx_tmp);